Remove the ENABLE_NLS check, since GLib can't be built without anyway.

	* glib/gi18n.h: Remove the ENABLE_NLS check, since GLib can't
	be built without anyway.  (#135899, Murray Cumming)

diff --git a/ChangeLog b/ChangeLog
index fd94f5c..0e1f2d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  8 00:54:32 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n.h: Remove the ENABLE_NLS check, since GLib can't
+       be built without anyway.  (#135899, Murray Cumming)
+
 Mon Jul  5 18:50:27 2004  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmessages.h (g_debug): Complete the g_log() 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fd94f5c..0e1f2d8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Jul  8 00:54:32 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n.h: Remove the ENABLE_NLS check, since GLib can't
+       be built without anyway.  (#135899, Murray Cumming)
+
 Mon Jul  5 18:50:27 2004  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmessages.h (g_debug): Complete the g_log() 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fd94f5c..0e1f2d8 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Jul  8 00:54:32 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n.h: Remove the ENABLE_NLS check, since GLib can't
+       be built without anyway.  (#135899, Murray Cumming)
+
 Mon Jul  5 18:50:27 2004  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmessages.h (g_debug): Complete the g_log() 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fd94f5c..0e1f2d8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Jul  8 00:54:32 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n.h: Remove the ENABLE_NLS check, since GLib can't
+       be built without anyway.  (#135899, Murray Cumming)
+
 Mon Jul  5 18:50:27 2004  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmessages.h (g_debug): Complete the g_log() 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fd94f5c..0e1f2d8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Jul  8 00:54:32 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gi18n.h: Remove the ENABLE_NLS check, since GLib can't
+       be built without anyway.  (#135899, Murray Cumming)
+
 Mon Jul  5 18:50:27 2004  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmessages.h (g_debug): Complete the g_log() 

diff --git a/glib/gi18n.h b/glib/gi18n.h
index 1bbb6eb..730fbb2 100644 (file)
--- a/glib/gi18n.h
+++ b/glib/gi18n.h
@@ -20,10 +20,8 @@
 #define __G_I18N_H__
 
 #include <glib/gstrfuncs.h>
-
-#ifdef ENABLE_NLS
-
 #include <libintl.h>
+
 #define _(String) gettext (String)
 #define Q_(String) g_strip_context ((String), gettext (String))
 #ifdef gettext_noop
@@ -32,19 +30,6 @@
 #define N_(String) (String)
 #endif
 
-#else /* NLS is disabled */
-
-#define _(String) (String)
-#define Q_(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain) 
-
-#endif
-
 #endif  /* __G_I18N_H__ */