From a0465f83b153679b33f353e6881418b9076cf61b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Jul 2004 04:03:50 +0000 Subject: [PATCH] Remove the ENABLE_NLS check here as well. Mon Jul 12 00:02:40 2004 Matthias Clasen * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib/gi18n-lib.h | 15 --------------- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f192b29..282c60b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 12 00:02:40 2004 Matthias Clasen + + * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well. + 2004-07-09 Matthias Clasen * glib/gdir.c (g_dir_open): Convert filename to UTF-8 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f192b29..282c60b8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Mon Jul 12 00:02:40 2004 Matthias Clasen + + * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well. + 2004-07-09 Matthias Clasen * glib/gdir.c (g_dir_open): Convert filename to UTF-8 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 7f192b29..282c60b8 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +Mon Jul 12 00:02:40 2004 Matthias Clasen + + * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well. + 2004-07-09 Matthias Clasen * glib/gdir.c (g_dir_open): Convert filename to UTF-8 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7f192b29..282c60b8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Mon Jul 12 00:02:40 2004 Matthias Clasen + + * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well. + 2004-07-09 Matthias Clasen * glib/gdir.c (g_dir_open): Convert filename to UTF-8 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f192b29..282c60b8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Mon Jul 12 00:02:40 2004 Matthias Clasen + + * glib/gi18n-lib.h: Remove the ENABLE_NLS check here as well. + 2004-07-09 Matthias Clasen * glib/gdir.c (g_dir_open): Convert filename to UTF-8 diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h index dc1a6208..48e9fa25 100644 --- a/glib/gi18n-lib.h +++ b/glib/gi18n-lib.h @@ -21,8 +21,6 @@ #include -#ifdef ENABLE_NLS - #include #ifndef GETTEXT_PACKAGE @@ -37,19 +35,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_LIB_H__ */ -- 2.34.1