Bug 559110 – Do not include libintl.h after glibintl.h

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.


svn path=/trunk/; revision=7688
This commit is contained in:
Matthias Clasen
2008-11-28 06:24:51 +00:00
committed by Matthias Clasen
parent 0b715510de
commit 6417df2a91
3 changed files with 10 additions and 4 deletions

View File

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