From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 23 Mar 2009 08:56:20 +0000 (+0000)
Subject: ebl  Tweak code to compile win64 version with mingw
X-Git-Tag: Release-7.0.0~3270
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eda56cbe5a635144d0811fe0fcec9b931a2b45d1;p=bacula%2Fbacula

ebl  Tweak code to compile win64 version with mingw



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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index f7d2327b01..c341826e7c 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -43,13 +43,6 @@
 #define TRUE  1
 #define FALSE 0
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 #ifdef HAVE_TLS
 #define have_tls 1
 #else
diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index 4a7c30de53..bd08067dd6 100644
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -247,5 +247,11 @@ enum {
    CF_CREATED                         /* file created, no data to extract */
 };
 
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
 
 #endif /* __bc_types_INCLUDED */
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index f61d1f3628..05e49296e4 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -49,6 +49,8 @@ Code to be completed before 3.0.0 is released:
 
 
 General:
+23Mar09
+ebl  Tweak code to compile win64 version with mingw
 21Mar09
 Kes  Attempt to correct timing problems with starting bat and obtaining
      lists. Maintain in_command counter to know when a list is coming.