Commit 6417df2a authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

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
parent 0b715510
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>
Bug 562378 – callback return value not respected for callback option
......
......@@ -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 */
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment