Restore win32 dir from Branch-5.2 and update it

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 5ba3b89a29bd2c39430c9a7cf4603e360e65d393..b4bca5176d8fa180cea38205acfce878a32de65c 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -1,17 +1,20 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2000-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2017 Kern Sibbald
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   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.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
  * bacula.h -- main header file to include in all Bacula source
@@ -35,8 +38,9 @@
 
 #if defined(HAVE_WIN32)
 #if defined(HAVE_MINGW)
-#include "mingwconfig.h"
+#include "winhdrs.h"
 #else
+#error "Only MINGW is supported"
 #include "winconfig.h"
 #endif
 #else
@@ -51,16 +55,18 @@
 
 
 /* System includes */
-#if HAVE_STDINT_H
+#if defined(HAVE_STDINT_H)
 #ifndef __sgi
 #include <stdint.h>
 #endif
+#elif defined(HAVE_INTTYPES_H)
+#include  <inttypes.h>
 #endif
-#if HAVE_STDARG_H
+#if defined(HAVE_STDARG_H)
 #include <stdarg.h>
 #endif
 #include <stdio.h>
-#if HAVE_STDLIB_H
+#if defined(HAVE_STDLIB_H)
 #include <stdlib.h>
 #endif
 #if HAVE_UNISTD_H
@@ -123,10 +129,10 @@ extern "C" {
 #endif
 #if defined(HAVE_WIN32) & !defined(HAVE_MINGW)
 #include <winsock2.h>
-#endif
+#endif 
 #if !defined(HAVE_WIN32) & !defined(HAVE_MINGW)
 #include <sys/stat.h>
-#endif
+#endif 
 #include <sys/time.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -151,8 +157,8 @@ extern "C" {
  *  includes before these.
  */
 #if defined(HAVE_WIN32)
-#include <windows.h>
-#include "win32/compat/compat.h"
+//#include <windows.h>
+#include "compat.h"
 #endif
 
 #include "version.h"
@@ -162,8 +168,31 @@ extern "C" {
 #include "baconfig.h"
 #include "lib/lib.h"
 
+/* manually enable feature that you want to test in DEVELOPER mode*/
+#ifdef DEVELOPER
+#endif
+
+#ifdef DDE_EXTRA_CHECKS
+const bool have_dde_extra_check = true;
+#else
+const bool have_dde_extra_check = false;
+#endif
+/*
+ * For wx-console compiles, we undo some Bacula defines.
+ *  This prevents conflicts between wx-Widgets and Bacula.
+ *  In wx-console files that malloc or free() Bacula structures
+ *  config/resources and interface to the Bacula libraries,
+ *  you must use bmalloc() and bfree().
+ */
+#ifdef HAVE_WXCONSOLE
+#undef New
+#undef _
+#undef free
+#undef malloc
+#endif
+
 #if defined(HAVE_WIN32)
-#include "win32/winapi.h"
+#include "winapi.h"
 #include "winhost.h"
 #else
 #include "host.h"