From 62aa466ff8bea6001a6ac0b7f7d1ab7c025aaa84 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 14 Oct 2008 12:47:58 +0000
Subject: [PATCH] Fix Win32 build to pull in new BACULA define.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7783 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kernstodo                  | 1 -
 bacula/src/version.h              | 4 ++--
 bacula/src/win32/compat/winhost.h | 8 +++++++-
 bacula/technotes-2.5              | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bacula/kernstodo b/bacula/kernstodo
index a9e713efcb..3f2fa06e8f 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -124,7 +124,6 @@ Priority:
   Win32 to avoid patent problems.
 - Implement multiple jobid specification for the cancel command,
   similar to what is permitted on the update slots command.
-- Implement Bacula plugins -- design API
 - modify pruning to keep a fixed number of versions of a file, 
   if requested.
 - the cd-command should allow complete paths
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4b5c919a98..2d22e07afd 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.5.14"
-#define BDATE   "11 October 2008"
-#define LSMDATE "11Oct08"
+#define BDATE   "14 October 2008"
+#define LSMDATE "14Oct08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */
diff --git a/bacula/src/win32/compat/winhost.h b/bacula/src/win32/compat/winhost.h
index 281cc27625..c4ffad8c8c 100644
--- a/bacula/src/win32/compat/winhost.h
+++ b/bacula/src/win32/compat/winhost.h
@@ -7,7 +7,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 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.
@@ -32,6 +32,11 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 
+#include "host.h"
+#undef HOST_OS
+#undef DISTNAME
+#undef DISTVER
+
 #ifdef HAVE_MINGW
 
 #define HOST_OS  "Linux"
@@ -39,6 +44,7 @@
 #define DISTVER  "Win32"
 
 #else
+
 extern DLL_IMP_EXP char WIN_VERSION_LONG[];
 extern DLL_IMP_EXP char WIN_VERSION[];
 
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index 526b8706d1..03be0bcbed 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -17,6 +17,8 @@ dbdriver
 remove reader/writer in FOPTS????
 
 General:
+14Oct08
+kes  Fix Win32 build to pull in new BACULA define.
 13Oct08
 kes  Change IncludeDir to Exclude Dir Containing.
 kes  Implement code to prohibit ExcludeDirContaining in an
-- 
2.39.5