luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 05:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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

9
ChangeLog

@ -1,3 +1,12 @@
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.
2008-11-28 Matthias Clasen <mclasen@redhat.com> 2008-11-28 Matthias Clasen <mclasen@redhat.com>
Bug 562378 – callback return value not respected for callback option Bug 562378 – callback return value not respected for callback option

1
glib/glibintl.h

@ -29,6 +29,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
#define dcgettext(Domain,String,Type) (String) #define dcgettext(Domain,String,Type) (String)
#define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2)) #define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2))
#define bindtextdomain(Domain,Directory) (Domain) #define bindtextdomain(Domain,Directory) (Domain)
#define bind_textdomain_codeset(Domain,Codeset)
#endif #endif
/* not really I18N-related, but also a string marker macro */ /* not really I18N-related, but also a string marker macro */

4
glib/gutils.c

@ -120,10 +120,6 @@
#include <langinfo.h> #include <langinfo.h>
#endif #endif
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
#include <libintl.h>
#endif
const guint glib_major_version = GLIB_MAJOR_VERSION; const guint glib_major_version = GLIB_MAJOR_VERSION;
const guint glib_minor_version = GLIB_MINOR_VERSION; const guint glib_minor_version = GLIB_MINOR_VERSION;
const guint glib_micro_version = GLIB_MICRO_VERSION; const guint glib_micro_version = GLIB_MICRO_VERSION;