Fix Win32 build for TLS

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

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 1324ded84f4c416772fc3ff43a7d17d4f4d74735..c2cc7e6d13950e4e736bdb98053db4611cebd7bf 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
 #define VERSION "1.37.17"
-#define BDATE   "06 May 2005"
-#define LSMDATE "06May05"
+#define BDATE   "07 May 2005"
+#define LSMDATE "07May05"
 
 /* Debug flags */
 #undef  DEBUG

diff --git a/bacula/src/win32/baculafd/baculafd.mak b/bacula/src/win32/baculafd/baculafd.mak
index d851f5e011d586f070175c61a3c37c9f5910f197..a5f1dea2c246adf9d98cded978ab0e025e150bf6 100644 (file)
--- a/bacula/src/win32/baculafd/baculafd.mak
+++ b/bacula/src/win32/baculafd/baculafd.mak
@@ -103,6 +103,7 @@ CLEAN :
         -@erase "$(INTDIR)\smartall.obj"
         -@erase "$(INTDIR)\status.obj"
         -@erase "$(INTDIR)\StdAfx.obj"
+        -@erase "$(INTDIR)\tls.obj"
         -@erase "$(INTDIR)\tree.obj"
         -@erase "$(INTDIR)\util.obj"
         -@erase "$(INTDIR)\var.obj"
@@ -196,6 +197,7 @@ LINK32_OBJS= \
         "$(INTDIR)\smartall.obj" \
         "$(INTDIR)\status.obj" \
         "$(INTDIR)\StdAfx.obj" \
+        "$(INTDIR)\tls.obj" \
         "$(INTDIR)\tree.obj" \
         "$(INTDIR)\util.obj" \
         "$(INTDIR)\var.obj" \
@@ -355,6 +357,8 @@ CLEAN :
         -@erase "$(INTDIR)\status.sbr"
         -@erase "$(INTDIR)\StdAfx.obj"
         -@erase "$(INTDIR)\StdAfx.sbr"
+        -@erase "$(INTDIR)\tls.obj"
+        -@erase "$(INTDIR)\tls.sbr"
         -@erase "$(INTDIR)\tree.obj"
         -@erase "$(INTDIR)\tree.sbr"
         -@erase "$(INTDIR)\util.obj"
@@ -460,6 +464,7 @@ BSC32_SBRS= \
         "$(INTDIR)\smartall.sbr" \
         "$(INTDIR)\status.sbr" \
         "$(INTDIR)\StdAfx.sbr" \
+        "$(INTDIR)\tls.sbr" \
         "$(INTDIR)\tree.sbr" \
         "$(INTDIR)\util.sbr" \
         "$(INTDIR)\var.sbr" \
@@ -546,6 +551,7 @@ LINK32_OBJS= \
         "$(INTDIR)\smartall.obj" \
         "$(INTDIR)\status.obj" \
         "$(INTDIR)\StdAfx.obj" \
+        "$(INTDIR)\tls.obj" \
         "$(INTDIR)\tree.obj" \
         "$(INTDIR)\util.obj" \
         "$(INTDIR)\var.obj" \
@@ -1751,6 +1757,25 @@ SOURCE=.\StdAfx.cpp
 
 !ENDIF 
 
+SOURCE=..\lib\tls.cpp
+
+!IF  "$(CFG)" == "baculafd - Win32 Release"
+
+
+"$(INTDIR)\tls.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"
+
+
+"$(INTDIR)\tls.obj"     "$(INTDIR)\tls.sbr" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
 SOURCE=..\lib\tree.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"
@@ -1787,6 +1812,7 @@ SOURCE=..\lib\util.cpp
 
 !ENDIF 
 
+
 SOURCE=..\lib\var.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"
@@ -1805,6 +1831,8 @@ SOURCE=..\lib\var.cpp
 
 !ENDIF 
 
+
+
 SOURCE=..\filed\verify.cpp
 
 !IF  "$(CFG)" == "baculafd - Win32 Release"

diff --git a/bacula/src/win32/console/console.mak b/bacula/src/win32/console/console.mak
index 376061ddb0ea1a4053e2713359c5c6183b5e8ebb..7d0c98213b814e75b2754200d1c9681b8a3ab00b 100644 (file)
--- a/bacula/src/win32/console/console.mak
+++ b/bacula/src/win32/console/console.mak
@@ -73,6 +73,7 @@ CLEAN :
         -@erase "$(INTDIR)\serial.obj"
         -@erase "$(INTDIR)\sha1.obj"
         -@erase "$(INTDIR)\smartall.obj"
+        -@erase "$(INTDIR)\tls.obj"
         -@erase "$(INTDIR)\StdAfx.obj"
         -@erase "$(INTDIR)\btimers.obj"
         -@erase "$(INTDIR)\util.obj"
@@ -124,6 +125,7 @@ LINK32_OBJS= \
         "$(INTDIR)\serial.obj" \
         "$(INTDIR)\sha1.obj" \
         "$(INTDIR)\smartall.obj" \
+        "$(INTDIR)\tls.obj" \
         "$(INTDIR)\StdAfx.obj" \
         "$(INTDIR)\btimers.obj" \
         "$(INTDIR)\util.obj" \
@@ -180,6 +182,7 @@ CLEAN :
         -@erase "$(INTDIR)\serial.obj"
         -@erase "$(INTDIR)\sha1.obj"
         -@erase "$(INTDIR)\smartall.obj"
+        -@erase "$(INTDIR)\tls.obj"
         -@erase "$(INTDIR)\StdAfx.obj"
         -@erase "$(INTDIR)\btimers.obj"
         -@erase "$(INTDIR)\util.obj"
@@ -232,6 +235,7 @@ LINK32_OBJS= \
         "$(INTDIR)\serial.obj" \
         "$(INTDIR)\sha1.obj" \
         "$(INTDIR)\smartall.obj" \
+        "$(INTDIR)\tls.obj" \
         "$(INTDIR)\StdAfx.obj" \
         "$(INTDIR)\btimers.obj" \
         "$(INTDIR)\util.obj" \
@@ -475,6 +479,11 @@ SOURCE=..\lib\smartall.cpp
 "$(INTDIR)\smartall.obj" : $(SOURCE) "$(INTDIR)"
         $(CPP) $(CPP_PROJ) $(SOURCE)
 
+SOURCE=..\lib\tls.cpp
+
+"$(INTDIR)\tls.obj" : $(SOURCE) "$(INTDIR)"
+        $(CPP) $(CPP_PROJ) $(SOURCE)
+
 
 SOURCE=.\StdAfx.cpp
 

diff --git a/bacula/src/win32/console/filelist b/bacula/src/win32/console/filelist
index 90e55fee41d377fcbc001054cd03f08b11768352..152c443b71c64c8c7b1ed35fe019cc13eb4c8e08 100644 (file)
--- a/bacula/src/win32/console/filelist
+++ b/bacula/src/win32/console/filelist
@@ -5,6 +5,7 @@
 ..\lib\bnet
 ..\lib\bsys
 ..\lib\btime
+..\lib\btimers
 ..\lib\cram-md5
 ..\lib\crc32
 ..\lib\dlist
@@ -25,7 +26,7 @@
 ..\lib\serial
 ..\lib\sha1
 ..\lib\smartall
-..\lib\btimers
+..\lib\tls
 ..\lib\util
 ..\lib\watchdog
 ..\lib\winapi

diff --git a/bacula/src/win32/lib/tls.cpp b/bacula/src/win32/lib/tls.cpp
new file mode 100644 (file)
index 0000000..9649181
--- /dev/null
+++ b/bacula/src/win32/lib/tls.cpp
@@ -0,0 +1 @@
+#include "../../lib/tls.c"

diff --git a/bacula/src/win32/wx-console/filelist b/bacula/src/win32/wx-console/filelist
index 190a095353c73ba35f3eee51efb35935a4921649..f97c202452e1ba1bea771cc2498e2a351a96e61d 100644 (file)
--- a/bacula/src/win32/wx-console/filelist
+++ b/bacula/src/win32/wx-console/filelist
@@ -36,6 +36,7 @@
 ..\lib\signal
 ..\lib\smartall
 ..\lib\btimers
+..\lib\tls
 ..\lib\tree
 ..\lib\util
 ..\lib\var

diff --git a/bacula/src/win32/wx-console/wx-console.mak b/bacula/src/win32/wx-console/wx-console.mak
index 5d617f0ad0b3fd854faeed9ca23c7325e389e5db..21cf99a15837b6ce7ff7efa1f74d8f6306771a8c 100644 (file)
--- a/bacula/src/win32/wx-console/wx-console.mak
+++ b/bacula/src/win32/wx-console/wx-console.mak
@@ -78,6 +78,7 @@ CLEAN :
        -@erase "$(INTDIR)\signal.obj"
        -@erase "$(INTDIR)\smartall.obj"
        -@erase "$(INTDIR)\btimers.obj"
+       -@erase "$(INTDIR)\tls.obj"
        -@erase "$(INTDIR)\tree.obj"
        -@erase "$(INTDIR)\util.obj"
        -@erase "$(INTDIR)\var.obj"
@@ -154,6 +155,7 @@ LINK32_OBJS= \
        "$(INTDIR)\signal.obj" \
        "$(INTDIR)\smartall.obj" \
        "$(INTDIR)\btimers.obj" \
+       "$(INTDIR)\tls.obj" \
        "$(INTDIR)\tree.obj" \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\var.obj" \
@@ -269,6 +271,8 @@ CLEAN :
        -@erase "$(INTDIR)\smartall.sbr"
        -@erase "$(INTDIR)\btimers.obj
        -@erase "$(INTDIR)\btimers.sbr"
+       -@erase "$(INTDIR)\tls.obj
+       -@erase "$(INTDIR)\tls.sbr"
        -@erase "$(INTDIR)\tree.obj
        -@erase "$(INTDIR)\tree.sbr"
        -@erase "$(INTDIR)\util.obj
@@ -361,6 +365,7 @@ BSC32_SBRS= \
        "$(INTDIR)\signal.sbr" \
        "$(INTDIR)\smartall.sbr" \
        "$(INTDIR)\btimers.sbr" \
+       "$(INTDIR)\tls.sbr" \
        "$(INTDIR)\tree.sbr" \
        "$(INTDIR)\util.sbr" \
        "$(INTDIR)\var.sbr" \
@@ -432,6 +437,7 @@ LINK32_OBJS= \
        "$(INTDIR)\signal.obj" \
        "$(INTDIR)\smartall.obj" \
        "$(INTDIR)\btimers.obj" \
+       "$(INTDIR)\tls.obj" \
        "$(INTDIR)\tree.obj" \
        "$(INTDIR)\util.obj" \
        "$(INTDIR)\var.obj" \
@@ -1228,6 +1234,25 @@ SOURCE=..\lib\btimers.cpp
 !ENDIF 
 
 
+FILENAME=tls
+SOURCE=..\lib\tls.cpp
+!IF  "$(CFG)" == "wx-console - Win32 Release"
+
+
+"$(INTDIR)\$(FILENAME).obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "wx-console - Win32 Debug"
+
+
+"$(INTDIR)\$(FILENAME).obj"    "$(INTDIR)\$(FILENAME).sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
 FILENAME=tree
 SOURCE=..\lib\tree.cpp
 !IF  "$(CFG)" == "wx-console - Win32 Release"