Fix bug # 746 - Windows FD crashes when job canceled

[bacula/bacula] / bacula / src / baconfig.h

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index 8b46f79e0bf5f16a80076884e89aeac1f93c6f63..4c7ae5ef3105c46fc1708965b4aac4ff8386411e 100644 (file)
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -83,7 +83,6 @@ void InitWinAPIWrapper();
 
 #define  OSDependentInit()    InitWinAPIWrapper()
 
-#undef ENABLE_NLS
 
 #if defined(BUILDING_DLL)
 #  define DLL_IMP_EXP   _declspec(dllexport)
@@ -110,6 +109,7 @@ void InitWinAPIWrapper();
 #define  tape_read            read
 #define  tape_write           write
 #define  tape_close           ::close
+
 #endif
 
 
@@ -123,6 +123,12 @@ void InitWinAPIWrapper();
       #define N_(s) (s)
    #endif /* N_ */
 #else /* !ENABLE_NLS */
+   #undef _
+   #undef N_
+   #undef textdomain
+   #undef bindtextdomain
+   #undef setlocale
+
    #ifndef _
       #define _(s) (s)
    #endif
@@ -139,6 +145,8 @@ void InitWinAPIWrapper();
       #define setlocale(p, d)
    #endif
 #endif /* ENABLE_NLS */
+
+
 /* Use the following for strings not to be translated */
 #define NT_(s) (s)   
 
@@ -532,6 +540,14 @@ int  m_msg(const char *file, int line, POOLMEM *&pool_buf, const char *fmt, ...)
 #ifndef HAVE_WXCONSOLE
 #undef strdup
 #define strdup(buf) bad_call_on_strdup_use_bstrdup(buf)
+#else 
+/* Groan, WxWidgets has its own way of doing NLS so cleanup */
+#ifndef ENABLE_NLS
+#undef _
+#undef setlocale
+#undef textdomain
+#undef bindtextdomain
+#endif  
 #endif
 
 /* Use our fgets which handles interrupts */
@@ -648,7 +664,6 @@ extern int h_errno;
  */
 extern "C" int getdomainname(char *name, int namelen);
 extern "C" int setdomainname(char *name, int namelen);
-#define uLong unsigned long
 #endif /* HAVE_HPUX_OS */