From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 9 Feb 2008 14:20:37 +0000 (+0000)
Subject: Fix Win32 build
X-Git-Tag: Release-3.0.0~1898
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=098d16ae453ce7feeaaf8505fc31af84f75459ea;p=bacula%2Fbacula

Fix Win32 build

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

diff --git a/bacula/src/filed/fd-plugins.c b/bacula/src/filed/fd-plugins.c
index 88fee12530..bd2d3ac1e1 100644
--- a/bacula/src/filed/fd-plugins.c
+++ b/bacula/src/filed/fd-plugins.c
@@ -41,11 +41,11 @@ extern int save_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level);
 
 
 /* Function pointers to be set here */
-extern int     (*plugin_bopen)(JCR *jcr, const char *fname, int flags, mode_t mode);
-extern int     (*plugin_bclose)(JCR *jcr);
-extern ssize_t (*plugin_bread)(JCR *jcr, void *buf, size_t count);
-extern ssize_t (*plugin_bwrite)(JCR *jcr, void *buf, size_t count);
-extern boffset_t (*plugin_blseek)(JCR *jcr, boffset_t offset, int whence);
+extern DLL_IMP_EXP int     (*plugin_bopen)(JCR *jcr, const char *fname, int flags, mode_t mode);
+extern DLL_IMP_EXP int     (*plugin_bclose)(JCR *jcr);
+extern DLL_IMP_EXP ssize_t (*plugin_bread)(JCR *jcr, void *buf, size_t count);
+extern DLL_IMP_EXP ssize_t (*plugin_bwrite)(JCR *jcr, void *buf, size_t count);
+extern DLL_IMP_EXP boffset_t (*plugin_blseek)(JCR *jcr, boffset_t offset, int whence);
 
 
 /* Forward referenced functions */
diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index d0a157e96b..09cbb08792 100644
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -107,6 +107,7 @@ _Z15stream_to_asciii
 _Z16set_win32_backupP5BFILE
 _Z18is_portable_backupP5BFILE
 _Z19set_portable_backupP5BFILE
+_Z14set_cmd_pluginP5BFILEP3JCR
 _Z26processWin32BackupAPIBlockP5BFILEPvl
 _Z27is_restore_stream_supportedi
 _Z5binitP5BFILE
@@ -128,14 +129,14 @@ _Z9drivetypePKcPci
 _Z24enable_backup_privilegesP3JCRi
  
 ; find.o
-_Z10find_filesP3JCRP6FF_PKTPFiS2_PvbES3_
+_Z10find_filesP3JCRP6FF_PKTPFiS0_S2_bES4_
 _Z15init_find_filesv
 _Z15term_find_filesP6FF_PKT
 _Z16set_find_optionsP6FF_PKTil
 _Z22get_win32_drivelettersP6FF_PKTPc
  
 ; find_one.o
-_Z13find_one_fileP3JCRP6FF_PKTPFiS2_PvbES3_Pcjb
+_Z13find_one_fileP3JCRP6FF_PKTPFiS0_S2_bEPcjb
 _Z13term_find_oneP6FF_PKT
 _Z16has_file_changedP3JCRP6FF_PKT
  
@@ -143,7 +144,7 @@ _Z16has_file_changedP3JCRP6FF_PKT
 _Z6fstypePKcPci
  
 ; match.o
-_Z11match_filesP3JCRP6FF_PKTPFiS2_PvbES3_
+_Z11match_filesP3JCRP6FF_PKTPFiS0_S2_bE
 _Z16file_is_excludedP6FF_PKTPKc
 _Z16file_is_includedP6FF_PKTPKc
 _Z22get_next_included_fileP6FF_PKTP15s_included_file
@@ -721,3 +722,8 @@ watchdog_thread
  
 console_command DATA
 plugin_list DATA
+plugin_bopen DATA
+plugin_bclose DATA
+plugin_bwrite DATA
+plugin_bread DATA
+plugin_blseek DATA
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 7f7973d72b..6c5cd92b89 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -2,6 +2,7 @@
 
 General:
 09Feb08
+kes  Fix Win32 build.
 kes  Remove a redundant jcr argument to find_files, match_files, and
      find_one_file.
 kes  Implement '.status dir header|scheduled|running|terminated' that