From 0e19570b82da6e933c7982c7812427d2a31cf206 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <mvw@planets.elm.net>
Date: Wed, 29 Jul 2009 22:26:16 +0200
Subject: [PATCH] Move enum from protos.h to filed.h and move defines to top of
 filed.h

---
 bacula/src/filed/filed.h  | 28 ++++++++++++++++++----------
 bacula/src/filed/protos.h |  6 ------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/bacula/src/filed/filed.h b/bacula/src/filed/filed.h
index 89e719ebef..078f11019c 100644
--- a/bacula/src/filed/filed.h
+++ b/bacula/src/filed/filed.h
@@ -33,6 +33,24 @@
  *   Version $Id$
  */
 
+/*
+ * Number of acl errors to report per job.
+ */
+#define ACL_REPORT_ERR_MAX_PER_JOB	25
+
+/*
+ * Number of xattr errors to report per job.
+ */
+#define XATTR_REPORT_ERR_MAX_PER_JOB	25
+
+/*
+ * Return codes from acl and xattr subroutines.
+ */
+typedef enum {
+   bsub_exit_fatal = -1,
+   bsub_exit_nok = 0,
+   bsub_exit_ok = 1
+} bsub_exit_code;
 
 #define FILE_DAEMON 1
 #include "lib/htable.h"
@@ -50,13 +68,3 @@
 #endif
 
 extern CLIENT *me;                    /* "Global" Client resource */
-
-/*
- * Number of acl errors to report per job.
- */
-#define ACL_REPORT_ERR_MAX_PER_JOB	25
-
-/*
- * Number of xattr errors to report per job.
- */
-#define XATTR_REPORT_ERR_MAX_PER_JOB	25
diff --git a/bacula/src/filed/protos.h b/bacula/src/filed/protos.h
index acbefb1008..4a6d476e37 100644
--- a/bacula/src/filed/protos.h
+++ b/bacula/src/filed/protos.h
@@ -29,12 +29,6 @@
  *   Version $Id$
  */
 
-typedef enum {
-   bsub_exit_fatal = -1,
-   bsub_exit_nok = 0,
-   bsub_exit_ok = 1
-} bsub_exit_code;
-
 extern bool blast_data_to_storage_daemon(JCR *jcr, char *addr);
 extern void do_verify_volume(JCR *jcr);
 extern void do_restore(JCR *jcr);
-- 
2.39.5