From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 27 Jun 2009 20:54:20 +0000 (+0000)
Subject: Fix Win32 build -- turn off lockmgr and remove lockmgr defs
X-Git-Tag: Release-3.0.2~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=96bb9e198298899d48f4b8d28453a438b5863875;p=bacula%2Fbacula

Fix Win32 build -- turn off lockmgr and remove lockmgr defs

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

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 4d92290ef3..ab0ba1abd0 100644
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/dird/fd_cmds.c b/bacula/src/dird/fd_cmds.c
index 3a1d1999bd..7d3ca3225d 100644
--- a/bacula/src/dird/fd_cmds.c
+++ b/bacula/src/dird/fd_cmds.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/lib/lockmgr.c b/bacula/src/lib/lockmgr.c
index 2756cf825f..9cf9649c50 100644
--- a/bacula/src/lib/lockmgr.c
+++ b/bacula/src/lib/lockmgr.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2008-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2008-2009 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 31f94b1488..0dc1dec822 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "3.0.2"
-#define BDATE   "21 June 2009"
-#define LSMDATE "21Jun09"
+#define BDATE   "27 June 2009"
+#define LSMDATE "27Jun09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
@@ -62,12 +62,16 @@
  *   it can always be turned on, but we advise to use it only
  *   for debug
  */
-#ifdef DEVELOPER
+#if DEVELOPER
 # ifndef _USE_LOCKMGR
 #  define _USE_LOCKMGR
 # endif
 #endif
 
+#if !HAVE_LINUX_OS
+# undef _USE_LOCKMGR
+#endif
+
 /*
  * USE_VTAPE is a dummy tape driver. This is useful to
  *  run regress test.
diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def
index eddee9eec3..4187cf6563 100644
--- a/bacula/src/win32/lib/bacula32.def
+++ b/bacula/src/win32/lib/bacula32.def
@@ -758,11 +758,12 @@ watchdog_thread
 ; lockmgr.o
 _Z6lmgr_pPP16pthread_mutex_t_
 _Z6lmgr_vPP16pthread_mutex_t_
-_Z15lmgr_mutex_lockPP16pthread_mutex_t_PKci
-_Z17lmgr_mutex_unlockPP16pthread_mutex_t_PKci
-_Z14lmgr_cond_waitPP15pthread_cond_t_PP16pthread_mutex_t_
-_Z18lmgr_thread_createPP10pthread_t_PKP15pthread_attr_t_PFPvS6_ES6_
-_Z17lmgr_cleanup_mainv
+
+;_Z15lmgr_mutex_lockPP16pthread_mutex_t_PKci
+;_Z17lmgr_mutex_unlockPP16pthread_mutex_t_PKci
+;_Z14lmgr_cond_waitPP15pthread_cond_t_PP16pthread_mutex_t_
+;_Z18lmgr_thread_createPP10pthread_t_PKP15pthread_attr_t_PFPvS6_ES6_
+;_Z17lmgr_cleanup_mainv
 
 console_command DATA
 plugin_list DATA
diff --git a/bacula/technotes b/bacula/technotes
index 6f1ff6ebb7..4051e0e798 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,8 @@
           
 General:
 
+27Jun09
+kes  Fix Win32 build -- turn off lockmgr and remove lockmgr defs
 25Jun09
 kes  Modify xattr.c and acl.c not to fail the job on errors. This should
      fix bug #1305.