kes Print JobIds to be migrated in Job Report.

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index daedd83bd3048d30d1d3c3c633d2d57567b5e46f..9d49a63aee03a7597498450d7d1a4a16d8e4de8e 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -26,16 +26,13 @@
 #define _LANGUAGE_C_PLUS_PLUS 1
 #endif
 
-#ifdef WIN32
-#ifdef HAVE_MINGW
+#if defined(HAVE_WIN32)
+#if defined(HAVE_MINGW)
 #include "mingwconfig.h"
-#include "winhost.h"
-#define _STAT_H       /* don't pull in MinGW stat.h */
-#define _STAT_DEFINED /* don't pull in MinGW stat.h */
 #else
 #include "winconfig.h"
-#include "winhost.h"
 #endif
+#include "winhost.h"
 #else
 #include "config.h"
 #include "host.h"
@@ -108,9 +105,10 @@
 #endif
 #if defined(HAVE_WIN32) & !defined(HAVE_MINGW)
 #include <winsock2.h>
-#else
-//#include <sys/stat.h>
-#endif
+#endif 
+#if !defined(HAVE_WIN32) & !defined(HAVE_MINGW)
+#include <sys/stat.h>
+#endif 
 #include <sys/time.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -134,11 +132,25 @@
 /* Local Bacula includes. Be sure to put all the system
  *  includes before these.
  */
+#if defined(HAVE_WIN32)
+#include <windows.h>
+#include "win32/compat/compat.h"
+#endif
+
 #include "version.h"
 #include "bc_types.h"
 #include "baconfig.h"
 #include "lib/lib.h"
 
+#ifdef HAVE_WXCONSOLE
+#undef New
+#undef _
+#endif
+
+#if defined(HAVE_WIN32)
+#include "win32/winapi.h"
+#endif
+
 #ifndef HAVE_ZLIB_H
 #undef HAVE_LIBZ                      /* no good without headers */
 #endif