Fix windows build

diff --git a/bacula/src/filed/filed_conf.c b/bacula/src/filed/filed_conf.c
index f7a8559a3daddae03bbcb53c9a4a26af28558da9..52f869e5f92ddc4a03b91a69602017c6e4a910f6 100644 (file)
--- a/bacula/src/filed/filed_conf.c
+++ b/bacula/src/filed/filed_conf.c
@@ -41,7 +41,7 @@
 
 #include "bacula.h"
 #include "filed.h"
-#include "lib/status.h"
+#include "lib/status-pkt.h"
 
 /* Define the first and last resource ID record
  * types. Note, these should be unique for each

diff --git a/bacula/src/lib/status-pkt.h b/bacula/src/lib/status-pkt.h
new file mode 100644 (file)
index 0000000..c4c2ae4
--- /dev/null
+++ b/bacula/src/lib/status-pkt.h
@@ -0,0 +1,48 @@
+/*
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2022 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
+*/
+/*
+ *  Status packet definition that is used in both the SD and FD. It
+ *    permits Win32 to call output_status() and get the output back
+ *    at the callback address line by line, and for Linux code,
+ *    the output can be sent directly to a BSOCK.
+ *
+ *     Kern Sibbald, March MMVII
+ *
+ */
+
+#ifndef __STATUS_PKT_H_
+#define __STATUS_PKT_H_
+
+/*
+ * Packet to send to output_status()
+ */
+class STATUS_PKT {
+public:
+  BSOCK *bs;                       /* used on Unix machines */
+  void *context;                   /* Win32 */
+  void (*callback)(const char *msg, int len, void *context);  /* Win32 */
+  char api_opts[MAX_NAME_LENGTH];
+  int  api;                        /* set if we want API output, with api level */
+
+  /* Methods */
+  STATUS_PKT() { memset(this, 0, sizeof(STATUS_PKT)); };
+  ~STATUS_PKT() { };
+};
+
+#endif
\ No newline at end of file

diff --git a/bacula/src/lib/status.h b/bacula/src/lib/status.h
index f82d5c38e8b56df4ba4be8ff5f7d768580123046..ca2fe2f8fb95e19345e6dd2739d826401184b4b4 100644 (file)
--- a/bacula/src/lib/status.h
+++ b/bacula/src/lib/status.h
@@ -17,7 +17,7 @@
    Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
- *  Status packet definition that is used in both the SD and FD. It
+ *  Status packet is defined in status_pkt.h It is used in both the SD and FD. It
  *    permits Win32 to call output_status() and get the output back
  *    at the callback address line by line, and for Linux code,
  *    the output can be sent directly to a BSOCK.
@@ -33,22 +33,7 @@
    #include <sys/time.h>
    #include <sys/resource.h>
 #endif
-
-/*
- * Packet to send to output_status()
- */
-class STATUS_PKT {
-public:
-  BSOCK *bs;                       /* used on Unix machines */
-  void *context;                   /* Win32 */
-  void (*callback)(const char *msg, int len, void *context);  /* Win32 */
-  char api_opts[MAX_NAME_LENGTH];
-  int  api;                        /* set if we want API output, with api level */
-
-  /* Methods */
-  STATUS_PKT() { memset(this, 0, sizeof(STATUS_PKT)); };
-  ~STATUS_PKT() { };
-};
+#include "status-pkt.h"
 
 extern void output_status(STATUS_PKT *sp);
 

diff --git a/bacula/src/stored/stored_conf.c b/bacula/src/stored/stored_conf.c
index bcb8c860d0025f945a47e0aa844fe94f26d83b8e..69e6f97bf856b1aecd1f2b69a49a3094c5535198 100644 (file)
--- a/bacula/src/stored/stored_conf.c
+++ b/bacula/src/stored/stored_conf.c
@@ -24,7 +24,7 @@
 
 #include "bacula.h"
 #include "stored.h"
-#include "lib/status.h"
+#include "lib/status-pkt.h"
 
 /* First and last resource ids */
 int32_t r_first = R_FIRST;