Fix winapi.h

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

diff --git a/bacula/src/findlib/attribs.c b/bacula/src/findlib/attribs.c
index fecbddb67dd1686de55f9a2a1dba9cb8888f2a04..b709cb9f446c54b6176000966c913d5a9aec6f24 100755 (executable)
--- a/bacula/src/findlib/attribs.c
+++ b/bacula/src/findlib/attribs.c
@@ -104,7 +104,7 @@ int select_data_stream(FF_PKT *ff_pkt)
       default:
          /* All stream types that do not support gzip should clear out
           * FO_GZIP above, and this code block should be unreachable. */
-         ASSERT(!ff_pkt->flags & FO_GZIP);
+         ASSERT(!(ff_pkt->flags & FO_GZIP));
          return STREAM_NONE;
       }
    }

diff --git a/bacula/src/lib/winapi.h b/bacula/src/lib/winapi.h
index e068b0019cca713f91888862f348a27241edd35f..78b108adec29e7564eaaee5bf53d43e6650fd5fc 100644 (file)
--- a/bacula/src/lib/winapi.h
+++ b/bacula/src/lib/winapi.h
@@ -58,6 +58,7 @@ typedef char POOLMEM;
 
 int wchar_2_UTF8(char *pszUTF, const WCHAR *pszUCS, int cchChar = MAX_PATH_UTF8);
 int UTF8_2_wchar(POOLMEM **pszUCS, const char *pszUTF);
+int make_win32_path_UTF8_2_wchar(POOLMEM **pszUCS, const char *pszUTF, BOOL* pBIsRawPath = NULL);
 
 
 /* In ADVAPI32.DLL */

diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h
index fc28477104cfbf503b12800b7fe8f424aca81f06..51226006254606289c68bf3403f1b7495de65d65 100644 (file)
--- a/bacula/src/win32/compat/compat.h
+++ b/bacula/src/win32/compat/compat.h
@@ -69,7 +69,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <io.h>
-
+#include <lmcons.h>
 #if defined HAVE_MINGW
 #include <stdint.h>
 #include <sys/stat.h>