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)
This commit is contained in:
Matthias Clasen 2004-07-08 04:54:45 +00:00
parent a41b04a301
commit 86f178d04c
6 changed files with 26 additions and 16 deletions

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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()

View File

@ -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__ */