From: Nicolas Boichat <nicolas@boichat.ch>
Date: Fri, 19 Aug 2005 09:34:49 +0000 (+0000)
Subject: Fix gettext problem in wx-console when ENABLE_NLS is not set.
X-Git-Tag: Release-7.0.0~8495
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6be454f0fb35e4ad1d00f3c73a491fde708dc191;p=bacula%2Fbacula

Fix gettext problem in wx-console when ENABLE_NLS is not set.


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

diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index d7000e5709..04dc8c6617 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -59,26 +59,31 @@
 #define NPRT(x) (x)?(x):_("*None*")
 
 #ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#ifndef _
-#define _(s) gettext((s))
-#endif /* N */
-#ifndef N_
-#define N_(s) (s)
-#endif /* N_ */
-#else
-#undef _
-#define _(s) (s)
-#undef N_
-#define N_(s) (s)
-#undef textdomain
-#define textdomain(d)
-#undef bindtextdomain
-#define bindtextdomain(p, d)
-#undef setlocale
-#define setlocale(p, d)
-#endif
+   #include <libintl.h>
+   #include <locale.h>
+   #ifndef _
+      #define _(s) gettext((s))
+   #endif /* _ */
+   #ifndef N_
+      #define N_(s) (s)
+   #endif /* N_ */
+#else /* !ENABLE_NLS */
+   #ifndef _
+      #define _(s) (s)
+   #endif
+   #ifndef N_
+      #define N_(s) (s)
+   #endif
+   #ifndef textdomain
+      #define textdomain(d)
+   #endif
+   #ifndef bindtextdomain
+      #define bindtextdomain(p, d)
+   #endif
+   #ifndef setlocale
+      #define setlocale(p, d)
+   #endif
+#endif /* ENABLE_NLS */
 
 /* This should go away! ****FIXME***** */
 #define MAXSTRING 500