#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
#else
#include "config.h"
-#include "host.h"
#endif
#if HAVE_ALLOCA_H
#include <alloca.h>
#endif
-
+#if defined(_MSC_VER)
+#include <io.h>
+#include <direct.h>
+#include <process.h>
+#endif
#include <errno.h>
#include <fcntl.h>
#define O_NOATIME 0
#endif
+#if defined(_MSC_VER)
+extern "C" {
+#include "getopt.h"
+}
+#endif
+
#ifdef xxxxx
#ifdef HAVE_GETOPT_LONG
#include <getopt.h>
#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>
/* 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"
+/*
+ * 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 "winhost.h"
+#else
+#include "host.h"
+#endif
+
#ifndef HAVE_ZLIB_H
#undef HAVE_LIBZ /* no good without headers */
#endif