From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 13 Nov 2010 16:42:08 +0000 (+0100)
Subject: Fix win32 build
X-Git-Tag: Release-5.2.1~942
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c0d155bf676437a9b86d03e388cc5eb8edb1a00;p=bacula%2Fbacula

Fix win32 build
---

diff --git a/bacula/src/qt-console/bat.pro.mingw32.in b/bacula/src/qt-console/bat.pro.mingw32.in
index 26f5e01008..89c835d84a 100644
--- a/bacula/src/qt-console/bat.pro.mingw32.in
+++ b/bacula/src/qt-console/bat.pro.mingw32.in
@@ -25,7 +25,7 @@ cross-win32 {
   LIBS       +=  -mwindows -L../win32/release32 -lbacula
 }
 !cross-win32 {
-  LIBS        += -L../lib -lbac @OPENSSL_LIBS@
+  LIBS        += -L../lib -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
 }
 
 qwt {
@@ -46,7 +46,7 @@ FORMS += relabel/relabel.ui
 FORMS += mount/mount.ui     
 FORMS += console/console.ui 
 FORMS += restore/restore.ui restore/prerestore.ui restore/brestore.ui
-FORMS += restore/restoretree.ui                                      
+FORMS += restore/runrestore.ui restore/restoretree.ui                                      
 FORMS += run/run.ui run/runcmd.ui run/estimate.ui run/prune.ui       
 FORMS += select/select.ui select/textinput.ui                        
 FORMS += medialist/medialist.ui mediaedit/mediaedit.ui joblist/joblist.ui
diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index c149090b27..84e5bea4e4 100644
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -153,8 +153,8 @@ void bRestore::displayFiles(int64_t pathid, QString path)
    QStringList fieldlist;
    struct stat statp;
    int32_t LinkFI;
-   int nb;
-   int row=0;
+   int nb = 0;
+   int row = 0;
    Freeze frz_lst(*FileList); /* disable updating*/
    Freeze frz_rev(*FileRevisions); /* disable updating*/
    FileList->clearContents();