X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fversion.h;h=7ec359d2a3327324939a2506d05e797f082b9576;hb=622ee72055f42b85772a1f246eae84b8c90cb56e;hp=a755ba410bff4538d360020c848b8b14d8669926;hpb=5a4092955065ab126a84b2f0e906f44b6eb7a5c1;p=bacula%2Fbacula

diff --git a/bacula/src/version.h b/bacula/src/version.h
index a755ba410b..7ec359d2a3 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,11 +3,11 @@
  */
 
 #undef  VERSION
-#define VERSION "2.5.29"
-#define BDATE   "18 January 2009"
-#define LSMDATE "18Jan09"
+#define VERSION "3.1.6"
+#define BDATE   "06 December 2009"
+#define LSMDATE "06Dec09"
 
-#define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
+#define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
 
 /*
@@ -54,7 +54,26 @@
  *  penalties.
  */
 #ifdef DEVELOPER
-#define SMCHECK
+# define SMCHECK
+#endif
+
+/*
+ * _USE_LOCKMGR does lock/unlock mutex tracking (dead lock)
+ *   it can always be turned on, but we advise to use it only
+ *   for debug
+ */
+#if DEVELOPER
+# ifndef _USE_LOCKMGR
+#  define _USE_LOCKMGR
+# endif
+/*
+ * Enable priority management with the lock manager
+ */
+//# define USE_LOCKMGR_PRIORITY
+#endif
+
+#if !HAVE_LINUX_OS
+# undef _USE_LOCKMGR
 #endif
 
 /*
@@ -62,18 +81,18 @@
  *  run regress test.
  */
 #ifdef HAVE_LINUX_OS
-#define USE_VTAPE
+# define USE_VTAPE
 #endif
 
 /* 
  * for fastest speed but you must have a UPS to avoid unwanted shutdowns
  */
-#define SQLITE3_INIT_QUERY "PRAGMA synchronous = OFF"
+//#define SQLITE3_INIT_QUERY "PRAGMA synchronous = OFF"
 
 /*
  * for more safety, but is 30 times slower than above
  */
-//#define SQLITE3_INIT_QUERY "PRAGMA synchronous = NORMAL"
+#define SQLITE3_INIT_QUERY "PRAGMA synchronous = NORMAL"
 
 /*
  * This should always be on. It enables data encryption code