Restore all/done updates

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 5a2ae3d89ebfd2f1c25035844cfb9670e8b7b7bc..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,16 +27,28 @@
 #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
 #define _POSIX_PTHREAD_SEMANTICS 1
 
 /* System includes */
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#if HAVE_STDARG_H
 #include <stdarg.h>
+#endif
 #include <stdio.h>
-#if STDC_HEADERS
+#if HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #if HAVE_UNISTD_H
@@ -48,21 +60,26 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#ifdef xxxxx
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else
 #include "lib/getopt.h"
 #endif
+#endif 
 
 #include <string.h>
 #include <strings.h>
 #include <signal.h>
 #include <ctype.h>
+#ifndef _SPLINT_
 #include <syslog.h>
+#endif
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif
 #include <pwd.h>
+#include <grp.h>
 #include <time.h>
 #include <netdb.h>
 #include <sys/types.h>
@@ -70,8 +87,14 @@
 #include <sys/bitypes.h>
 #endif
 #include <sys/ioctl.h>
+#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>
@@ -84,8 +107,12 @@
  *  includes before these.  
  */
 #include "version.h"
-#include "baconfig.h"
 #include "bc_types.h"
+#include "baconfig.h"
 #include "lib/lib.h"
 
+#ifndef HAVE_ZLIB_H
+#undef HAVE_LIBZ                      /* no good without headers */
+#endif
+
 #endif