Fix problem of accents with new Win32 code.

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

diff --git a/bacula/kes-1.39 b/bacula/kes-1.39
index 651b525d9a340f373aa63da05d6b510266179249..9b331436bb4720ab494dc5d6b4403766b83a1a70 100644 (file)
--- a/bacula/kes-1.39
+++ b/bacula/kes-1.39
@@ -3,6 +3,7 @@
 
 General:
 29Apr06
+- Fix problem of accents with new Win32 code.
 - Integrate Howard's VSS patch. Tweak it a bit. VSS now
   works in the MinGW build with the exception that there
   is a problem with accented characters -- i.e. there is

diff --git a/bacula/src/bacula.h b/bacula/src/bacula.h
index 081611040d69cbf3b437cf023b80a4e1f3ecb127..5fd1d1f7a7c2d6eb5484e18c2a262c5da1aa0fb6 100644 (file)
--- a/bacula/src/bacula.h
+++ b/bacula/src/bacula.h
@@ -30,6 +30,8 @@
 #ifdef HAVE_MINGW
 #include "mingwconfig.h"
 #include "winhost.h"
+#define _STAT_H       /* don't pull in MinGW stat.h */
+#define _STAT_DEFINED /* don't pull in MinGW stat.h */
 #else
 #include "winconfig.h"
 #include "winhost.h"
@@ -101,7 +103,7 @@
 #if defined(HAVE_WIN32) & !defined(HAVE_MINGW)
 #include <winsock2.h>
 #else
-#include <sys/stat.h>
+//#include <sys/stat.h>
 #endif
 #include <sys/time.h>
 #if HAVE_SYS_WAIT_H

diff --git a/bacula/src/filed/win32/winbacula.h b/bacula/src/filed/win32/winbacula.h
index f56b9ed92b4906c417fcbd57528fe37248f3b8db..c61d39e8d4d7138569cfc87215207c4ee1788392 100755 (executable)
--- a/bacula/src/filed/win32/winbacula.h
+++ b/bacula/src/filed/win32/winbacula.h
@@ -31,15 +31,16 @@
 
 // WinUPS header file
 
+#ifdef HAVE_MINGW
+#include "compat.h"
+#endif
+
 #define STRICT 1
 #include <windows.h>
 #include <stdio.h>
 #include <process.h>
 #include "winres.h"
 
-#ifdef HAVE_MINGW
-#include "compat.h"
-#endif
 
 // Application specific messages