glib r7689 - in branches/glib-2-18: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Nov 28 06:28:13 2008
New Revision: 7689
URL: http://svn.gnome.org/viewvc/glib?rev=7689&view=rev

Log:
2008-11-28  Matthias Clasen  <mclasen redhat com>

        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.



Modified:
   branches/glib-2-18/ChangeLog
   branches/glib-2-18/glib/glibintl.h
   branches/glib-2-18/glib/gutils.c

Modified: branches/glib-2-18/glib/glibintl.h
==============================================================================
--- branches/glib-2-18/glib/glibintl.h	(original)
+++ branches/glib-2-18/glib/glibintl.h	Fri Nov 28 06:28:13 2008
@@ -29,6 +29,7 @@
 #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 */

Modified: branches/glib-2-18/glib/gutils.c
==============================================================================
--- branches/glib-2-18/glib/gutils.c	(original)
+++ branches/glib-2-18/glib/gutils.c	Fri Nov 28 06:28:13 2008
@@ -120,10 +120,6 @@
 #include <langinfo.h>
 #endif
 
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-#include <libintl.h>
-#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;