From 6417df2a917a48073f52d69f765a02eba57fc6cb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 28 Nov 2008 06:24:51 +0000 Subject: [PATCH] =?utf8?q?Bug=20559110=20=E2=80=93=20Do=20not=20include=20?= =?utf8?q?libintl.h=20after=20glibintl.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-11-28 Matthias Clasen Bug 559110 – Do not include libintl.h after glibintl.h * glib/glibintl.h: Define bind_textdomain_codeset in the DISABLE_NLS branch. Patch by Peter Kjellerstedt. * glib/gutil.c: Don't include libintl.h directly. svn path=/trunk/; revision=7688 --- ChangeLog | 9 +++++++++ glib/glibintl.h | 1 + glib/gutils.c | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22a412e..782538a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2008-11-28 Matthias Clasen + Bug 559110 – Do not include libintl.h after glibintl.h + + * glib/glibintl.h: Define bind_textdomain_codeset in the DISABLE_NLS + branch. Patch by Peter Kjellerstedt. + + * glib/gutil.c: Don't include libintl.h directly. + +2008-11-28 Matthias Clasen + Bug 562378 – callback return value not respected for callback option with no arg diff --git a/glib/glibintl.h b/glib/glibintl.h index 4bed7c1..0186723 100644 --- a/glib/glibintl.h +++ b/glib/glibintl.h @@ -29,6 +29,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str); #define dcgettext(Domain,String,Type) (String) #define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2)) #define bindtextdomain(Domain,Directory) (Domain) +#define bind_textdomain_codeset(Domain,Codeset) #endif /* not really I18N-related, but also a string marker macro */ diff --git a/glib/gutils.c b/glib/gutils.c index 9cc7cbe..d5407ca 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -120,10 +120,6 @@ #include #endif -#ifdef HAVE_BIND_TEXTDOMAIN_CODESET -#include -#endif - const guint glib_major_version = GLIB_MAJOR_VERSION; const guint glib_minor_version = GLIB_MINOR_VERSION; const guint glib_micro_version = GLIB_MICRO_VERSION; -- 2.7.4