Restore all/done updates

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index d8ed8df41a713a6a59f4e28ce36c37c53c30778d..35f3c07ea18e1300afaa28da89de69514e65422f 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -5,7 +5,7 @@
  */
 
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -27,7 +27,14 @@
 #ifndef _BACULA_H
 #define _BACULA_H 1
 
+#ifdef HAVE_WIN32
+#include "winconfig.h"
+#include "winhost.h"
+#else
 #include "config.h"
+#include "host.h"
+#endif
+
 
 #define _REENTRANT    1
 #define _THREAD_SAFE  1
@@ -72,6 +79,7 @@
 #include <limits.h>
 #endif
 #include <pwd.h>
+#include <grp.h>
 #include <time.h>
 #include <netdb.h>
 #include <sys/types.h>
@@ -82,7 +90,11 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_WIN32
+#include <winsock2.h>
+#else
 #include <sys/stat.h>
+#endif
 #include <sys/time.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -95,8 +107,8 @@
  *  includes before these.  
  */
 #include "version.h"
-#include "baconfig.h"
 #include "bc_types.h"
+#include "baconfig.h"
 #include "lib/lib.h"
 
 #ifndef HAVE_ZLIB_H