Fix Win32 build with new .def files and DLL_IMP_EXP ...

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

diff --git a/bacula/src/cats/sql_cmds.c b/bacula/src/cats/sql_cmds.c
index e953c342718f54f11330c078b64e2de7f7c31158..b847033d18896978a4a635fccc31c64607c5d3ea 100644 (file)
--- a/bacula/src/cats/sql_cmds.c
+++ b/bacula/src/cats/sql_cmds.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-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.

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 91a34cf417a6a66add53d81ce2bac5d5452c4953..2b624f823595163ccfad674c98d10a5f88d2d88f 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 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.

diff --git a/bacula/src/lib/runscript.h b/bacula/src/lib/runscript.h
index 5a6594f9a268f4d07c36ebd8b93ad042f64ae8d4..921fc11ef2a9a983232857d77fbee17cfdecfb57 100644 (file)
--- a/bacula/src/lib/runscript.h
+++ b/bacula/src/lib/runscript.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2006-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2006-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.
@@ -110,6 +110,6 @@ void free_runscript(RUNSCRIPT *script);
 /* foreach_alist free RUNSCRIPT */
 void free_runscripts(alist *runscripts); /* you have to free alist */
 
-extern bool (*console_command)(JCR *jcr, const char *cmd);
+extern DLL_IMP_EXP bool (*console_command)(JCR *jcr, const char *cmd);
 
 #endif /* __RUNSCRIPT_H_ */

diff --git a/bacula/src/win32/README.mingw32 b/bacula/src/win32/README.mingw32
index ecd0bb6b88c2cef531325ccde70f96bb98999b0e..09a34bf77785060dfcdfcac418410232dcab7754 100644 (file)
--- a/bacula/src/win32/README.mingw32
+++ b/bacula/src/win32/README.mingw32
@@ -201,7 +201,16 @@ exported.
 New data variables are exported by adding the macro DLL_IMP_EXP to
 the variable declaration in the header file.  All exported variables
 must be declared in a header file and MUST NOT be declared in a
-source file referencing the variable.
+source file referencing the variable. Example, src/lib/runscript.h:
+
+extern DLL_IMP_EXP bool (*console_command)(JCR *jcr, const char *cmd);
+
+or src/jcr.h
+
+extern int DLL_IMP_EXP num_jobs_run;
+extern DLL_IMP_EXP dlist * last_jobs;
+...
+
 
 Exporting functions is now more or less automated.  If you find that
 a function name has been added, changed, or an argument modified,    

diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index 857677e4d538c90dd66436e787e0f4c1605c7a8f..8bf1f070fe787e6d7215604491ed66a4e0a18886 100644 (file)
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -714,3 +714,4 @@ _Z17register_watchdogP12s_watchdog_t
 _Z19unregister_watchdogP12s_watchdog_t
 watchdog_thread
  
+console_command DATA

diff --git a/bacula/src/win32/dll/make_def b/bacula/src/win32/dll/make_def
index 89b036e0580d9adfabd07f309819ebe4869219e0..25f19880645630177163491b3378857991ca93f5 100755 (executable)
--- a/bacula/src/win32/dll/make_def
+++ b/bacula/src/win32/dll/make_def
@@ -17,3 +17,11 @@ for i in *.o ; do \
    ${NM} $i | grep "^[0-9a-f]* T _" | cut -c13- ; \
    echo " "; \
 done
+
+DATA="\
+   console_command"
+
+for i in ${DATA}; do \
+   echo "$i DATA"; \
+done
+

diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 9522891bc2f28f37941cd8cf3e23058e5f66ae6a..20d33f5dd4b1350b20d348a182518ec61a85a133 100644 (file)
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,6 +1,8 @@
               Technical notes on version 2.3
 
 General:
+12Jan08
+kes  Fix Win32 build with new .def files and DLL_IMP_EXP ...
 10Jan08
 kes  Add DataDespooling and DataCommitting status (committing is
      the last despooling).