Added compatibility for MinGW.

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

diff --git a/bacula/src/filed/win32/winbacula.h b/bacula/src/filed/win32/winbacula.h
index 36dcee03c001080ddc5aa8850f86464ecd492779..ea33d26a50c95ee498414fb1d2da99925158c757 100755 (executable)
--- a/bacula/src/filed/win32/winbacula.h
+++ b/bacula/src/filed/win32/winbacula.h
@@ -17,7 +17,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
 //  USA.
 //
-// If the source code for the VNC system is not available from the place 
+// If the source code for the VNC system is not available from the place
 // whence you received this file, check http://www.uk.research.att.com/vnc or contact
 // the authors on vnc@uk.research.att.com for information on obtaining it.
 //
@@ -37,6 +37,10 @@
 #include <process.h>
 #include "winres.h"
 
+#ifdef HAVE_MINGW
+#include "compat.h"
+#endif
+
 // Application specific messages
 
 // Message used for system tray notifications

diff --git a/bacula/src/filed/win32/winres.rc b/bacula/src/filed/win32/winres.rc
index 1aad255ea51399ee2de66801783e2f4633a78b17..e4e997b1419e7849820c07552021618bc3a484d8 100644 (file)
--- a/bacula/src/filed/win32/winres.rc
+++ b/bacula/src/filed/win32/winres.rc
@@ -20,7 +20,7 @@ IDI_JOB_ERROR           ICON    DISCARDABLE     "error.ico"
 // Menu
 //
 
-IDR_TRAYMENU MENU DISCARDABLE 
+IDR_TRAYMENU MENU DISCARDABLE
 BEGIN
     POPUP "tray"
     BEGIN
@@ -91,7 +91,7 @@ IDB_BACULABMP           BITMAP  DISCARDABLE     "bacula.bmp"
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE DISCARDABLE
 BEGIN
     IDI_BACULA              "Bacula"
 END
@@ -103,7 +103,7 @@ END
 #ifdef properties_implemented
 
 IDD_PROPERTIES DIALOG DISCARDABLE  0, 0, 221, 204
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Bacula Properties"
 FONT 8, "MS Sans Serif"
@@ -128,7 +128,9 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,190,120,50,15
 //  CONTROL         "\3", IDC_BACULABMP,"Static",SS_ICON | SS_CENTERIMAGE |
 //                  SS_SUNKEN,7,5,73,65
+#ifndef HAVE_MINGW
     CONTROL         IDB_BACULABMP,IDB_BACULABMP,"Static",SS_BITMAP|SS_SUNKEN,7,5,32,32
+#endif
 
     LTEXT           "      by Kern Sibbald",IDC_NAME,134,38,78,10
     LTEXT           "For more information, see:",-1,115,60,100,10
@@ -150,7 +152,7 @@ END
 //
 
 IDD_STATUS DIALOG DISCARDABLE  0, 0, 411, 244
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Bacula Status"
 FONT 8, "Courier New"
@@ -165,7 +167,7 @@ END
 //
 
 IDD_EVENTS DIALOG DISCARDABLE  0, 0, 411, 204
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | 
+STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Bacula Events"
 FONT 8, "Courier New"

diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c
index 99237457fbeaef06d8d45bc44c914ac5f60ca061..d73622e8219021ec98032db14a641b5cfd7b291f 100755 (executable)
--- a/bacula/src/findlib/attribs.c
+++ b/bacula/src/findlib/attribs.c
@@ -117,10 +117,17 @@ void encode_stat(char *buf, FF_PKT *ff_pkt, int data_stream)
    *p++ = ' ';
    p += to_base64((int64_t)statp->st_size, p);
    *p++ = ' ';
+#ifndef HAVE_MINGW
    p += to_base64((int64_t)statp->st_blksize, p);
    *p++ = ' ';
    p += to_base64((int64_t)statp->st_blocks, p);
    *p++ = ' ';
+#else
+   p += to_base64((int64_t)0, p); /* output place holder */
+   *p++ = ' ';
+   p += to_base64((int64_t)0, p); /* output place holder */
+   *p++ = ' ';
+#endif
    p += to_base64((int64_t)statp->st_atime, p);
    *p++ = ' ';
    p += to_base64((int64_t)statp->st_mtime, p);
@@ -174,12 +181,21 @@ int decode_stat(char *buf, struct stat *statp, int32_t *LinkFI)
    p += from_base64(&val, p);
    statp->st_size = val;
    p++;
+#ifndef HAVE_MINGW
    p += from_base64(&val, p);
    statp->st_blksize = val;
    p++;
    p += from_base64(&val, p);
    statp->st_blocks = val;
    p++;
+#else
+   p += from_base64(&val, p);
+//   statp->st_blksize = val;
+   p++;
+   p += from_base64(&val, p);
+//   statp->st_blocks = val;
+   p++;
+#endif
    p += from_base64(&val, p);
    statp->st_atime = val;
    p++;