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 f7d2327b01f44cc3859785be298fda5188c27ce4..c341826e7c6a3784d2ddeb5761aedc8549767fa5 100644 (file)
--- 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 4a7c30de5393fc38782454df0f9b17302245dd9b..bd08067dd67121186cd968f66c37b40db82ecc48 100644 (file)
--- 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 f61d1f36287260eae2e686312710da4ad12e502f..05e49296e4f65520875e475441dc2b05ecb964fa 100644 (file)
--- 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.