From 3d55195d8dfb628353eb0d384b685913f5c83362 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 6 Jun 2006 18:44:20 +0000
Subject: [PATCH] Fix Win32 cross-compile

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3049 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kes-1.38                  | 8 ++++++--
 bacula/src/win32/Makefile.in     | 5 +++++
 bacula/src/win32/compat/compat.h | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bacula/kes-1.38 b/bacula/kes-1.38
index b9a436cce0..99803cb71d 100644
--- 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 271c3f249a..0d93a16b7f 100644
--- 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 81b58943ac..fe0c44f740 100644
--- 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 *);
-- 
2.39.5