Fix Win32 cross-compile

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3049 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/kes-1.38 b/bacula/kes-1.38
index b9a436cce06b1d6c1e970b58472598299e80e054..99803cb71d8e9fd4f58e5044a1c72f60c0a95074 100644 (file)
--- a/bacula/kes-1.38
+++ b/bacula/kes-1.38
@@ -2,6 +2,12 @@
                         Kern Sibbald
 
 General:
+04Jun06
+- Modify configure.in to check for typeof().
+- Better detection of postgresql installation if pg_conf works.
+- Fix RescheduleTimes = 0 bug (should not reschedule).
+- Down port from 1.39: fixes for reload, autochanger error messages,
+  scheduler fixes for reload and day light savings change, 
 01Jun06
 - Implement partial error messages for src/filed/acl.c
 - Fix return code to fail when doing update barcodes and
@@ -11,8 +17,6 @@ General:
 26May06
 - Prevent DVD code from rewriting label if the device cannot be
   opened read/write.
-- Used __GNUC__ to detect GNU g++ as suggested by John Goerzen to
-  fix Debian build bug.
 - Fix Dir/SD run race in migrate.c, verify.c, and restore.c
 - Update projects file.
 24May06

diff --git a/bacula/src/win32/Makefile.in b/bacula/src/win32/Makefile.in
index 271c3f249a6d643ad0a7dcb381992d6829437b37..0d93a16b7fa87bd0465170c0aa476199e1a7c3b5 100644 (file)
--- a/bacula/src/win32/Makefile.in
+++ b/bacula/src/win32/Makefile.in
@@ -281,6 +281,7 @@ LIB_OBJS = \
        $(LIBDIR)/pythonlib.o \
        $(LIBDIR)/queue.o \
        $(LIBDIR)/res.o \
+       $(LIBDIR)/runscript.o \
        $(LIBDIR)/rwlock.o \
        $(LIBDIR)/semlock.o \
        $(LIBDIR)/serial.o \
@@ -399,6 +400,10 @@ $(LIBDIR)/queue.o:   ../lib/queue.c
 $(LIBDIR)/res.o:  ../lib/res.c
        $(CXX) -c $< -o $@              
 
+$(LIBDIR)/runscript.o: ../lib/runscript.c
+       $(CXX) -c $< -o $@              
+
+
 $(LIBDIR)/rwlock.o:      ../lib/rwlock.c
        $(CXX) -c $< -o $@              
 

diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h
index 81b58943ac446e709d1b844cf37053c0f3899c2b..fe0c44f74056ab969f0ad19a81d356ed0296912b 100644 (file)
--- a/bacula/src/win32/compat/compat.h
+++ b/bacula/src/win32/compat/compat.h
@@ -342,14 +342,14 @@ struct sigaction {
 #define unlink win32_unlink
 #define chdir win32_chdir
 extern "C" void syslog(int type, const char *fmt, ...);
+
+#ifndef HAVE_MINGW
 #ifndef LOG_DAEMON
 #define LOG_DAEMON 0
 #endif
 #ifndef LOG_ERR
 #define LOG_ERR 0
 #endif
-
-#ifndef HAVE_MINGW
 #define R_OK 04
 #define W_OK 02
 int stat(const char *, struct stat *);