Loose #ifdef and use const bool wrapper for some cleaner coding.

[bacula/bacula] / bacula / src / filed / filed.h

diff --git a/bacula/src/filed/filed.h b/bacula/src/filed/filed.h
index 078f11019c8cf25a5ad2fa8fa8cc0205cec2a495..54905cbf445466600514e0be258dde13b5bed316 100644 (file)
--- a/bacula/src/filed/filed.h
+++ b/bacula/src/filed/filed.h
@@ -44,19 +44,30 @@
 #define XATTR_REPORT_ERR_MAX_PER_JOB   25
 
 /*
- * Return codes from acl and xattr subroutines.
+ * Return codes from acl subroutines.
  */
 typedef enum {
-   bsub_exit_fatal = -1,
-   bsub_exit_nok = 0,
-   bsub_exit_ok = 1
-} bsub_exit_code;
+   bacl_exit_fatal = -1,
+   bacl_exit_error = 0,
+   bacl_exit_ok = 1
+} bacl_exit_code;
+
+/*
+ * Return codes from xattr subroutines.
+ */
+typedef enum {
+   bxattr_exit_fatal = -1,
+   bxattr_exit_error = 0,
+   bxattr_exit_ok = 1
+} bxattr_exit_code;
 
 #define FILE_DAEMON 1
 #include "lib/htable.h"
 #include "filed_conf.h"
 #include "fd_plugins.h"
 #include "findlib/find.h"
+#include "acl.h"
+#include "xattr.h"
 #include "jcr.h"
 #include "protos.h"                   /* file daemon prototypes */
 #include "lib/runscript.h"