From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 24 Apr 2010 02:47:55 +0000 (+0200)
Subject: Fix Windows build
X-Git-Tag: Release-5.2.1~1415
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed8a5d547f52bfc0ab5c24a6105d6f7fef1a3087;p=bacula%2Fbacula

Fix Windows build
---

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 7fd9bf70e3..26ea47809a 100644
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -1106,7 +1106,7 @@ bool encode_and_send_attributes(JCR *jcr, FF_PKT *ff_pkt, int &data_stream)
    BSOCK *sd = jcr->store_bsock;
    char attribs[MAXSTRING];
    char attribsExBuf[MAXSTRING];
-   char *attribsEx;
+   char *attribsEx = NULL;
    int attr_stream;
    int comp_len;
    bool stat;
@@ -1360,7 +1360,7 @@ static void close_vss_backup_session(JCR *jcr)
          }
       }
       WCHAR *metadata = g_pVSSClient->GetMetadata();
-      if (metatdata) {
+      if (metadata) {
          FF_PKT *ff_pkt = jcr->ff;
          ff_pkt->fname = "job";
          ff_pkt->type = FT_RESTORE_FIRST;
diff --git a/bacula/src/win32/lib/bacula32.def b/bacula/src/win32/lib/bacula32.def
index f859eaf932..52c5afb6f7 100644
--- a/bacula/src/win32/lib/bacula32.def
+++ b/bacula/src/win32/lib/bacula32.def
@@ -329,6 +329,8 @@ _Z8bstrncatPcPKci
 _Z8bstrncatPcR8POOL_MEMi
 _Z8bstrncpyPcPKci
 _Z8bstrncpyPcR8POOL_MEMi
+_Z8ZdeflatePciS_Ri
+_Z8ZinflatePciS_Ri
  
 ; btime.o
 _Z10bstrftimesPcix
@@ -493,7 +495,7 @@ _Z13get_jcr_by_idj
 _Z13jcr_walk_nextP3JCR
 _Z14jcr_walk_startv
 _Z9job_countv
-_Z14set_jcr_in_tsdP3JCR
+_Z14set_jcr_in_tsdP3JCRb
 _Z16get_jcr_from_tsdv
 _Z18get_jobid_from_tsdv
 _Z18get_jcr_by_sessionjj
@@ -513,6 +515,7 @@ _Z7new_jcriPFvP3JCRE
 _Z9lock_jobsv
 _ZN3JCR14get_ActionNameEb
 _ZN3JCR17get_OperationNameEv
+_ZN3JCR21my_thread_send_signalEi
 _ZN3JCR8JobReadsEv
 _Z16dbg_jcr_add_hookPFvP3JCRP6_iobufE
 timeout_handler
diff --git a/bacula/src/win32/lib/bacula64.def b/bacula/src/win32/lib/bacula64.def
index dc8084929e..19ecbb5adc 100644
--- a/bacula/src/win32/lib/bacula64.def
+++ b/bacula/src/win32/lib/bacula64.def
@@ -323,6 +323,8 @@ _Z8bstrncatPcPKci
 _Z8bstrncatPcR8POOL_MEMi
 _Z8bstrncpyPcPKci
 _Z8bstrncpyPcR8POOL_MEMi
+_Z8ZdeflatePciS_Ri
+_Z8ZinflatePciS_Ri
  
 ; btime.o
 _Z10bstrftimesPcix
@@ -486,7 +488,7 @@ _Z12job_end_pushP3JCRPFvS0_PvES1_
 _Z13get_jcr_by_idj
 _Z13jcr_walk_nextP3JCR
 _Z14jcr_walk_startv
-_Z14set_jcr_in_tsdP3JCR
+_Z14set_jcr_in_tsdP3JCRb
 _Z16get_jcr_from_tsdv
 _Z18get_jobid_from_tsdv
 _Z18get_jcr_by_sessionjj
@@ -506,6 +508,7 @@ _Z7new_jcriPFvP3JCRE
 _Z9lock_jobsv
 _ZN3JCR14get_ActionNameEb
 _ZN3JCR17get_OperationNameEv
+_ZN3JCR21my_thread_send_signalEi
 _ZN3JCR8JobReadsEv
 _Z16dbg_jcr_add_hookPFvP3JCRP6_iobufE
 timeout_handler