o initial add

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index e820a93c0e7f811ca84f3c8b2673a4545f6791dc..daedd83bd3048d30d1d3c3c633d2d57567b5e46f 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -4,7 +4,7 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -27,8 +27,15 @@
 #endif
 
 #ifdef WIN32
+#ifdef 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"
@@ -60,9 +67,15 @@
 #if HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
+
 #include <errno.h>
 #include <fcntl.h>
 
+/* O_NOATIME is defined at fcntl.h when supported */
+#ifndef O_NOATIME
+#define O_NOATIME 0
+#endif
+
 #ifdef xxxxx
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
@@ -93,10 +106,10 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_WIN32
+#if defined(HAVE_WIN32) & !defined(HAVE_MINGW)
 #include <winsock2.h>
 #else
-#include <sys/stat.h>
+//#include <sys/stat.h>
 #endif
 #include <sys/time.h>
 #if HAVE_SYS_WAIT_H
@@ -113,6 +126,8 @@
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>
 #include <openssl/err.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
 #undef STORE
 #endif