If !ENABLE_NLS, make textomain() macro return "messages" in case of a NULL

* glib/glibintl.h: If !ENABLE_NLS, make textomain() macro
        return "messages" in case of a NULL argument. Patch by
        Peter Kjellerstedt.


svn path=/trunk/; revision=7812
This commit is contained in:
Matthias Clasen 2009-01-18 01:08:17 +00:00
parent ed6c7f0e32
commit 1da8112081
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,12 @@
2009-01-17 Matthias Clasen <mclasen@redhat.com>
Bug 567977 textdomain() macro should not return NULL when
ENABLE_NLS is not set
* glib/glibintl.h: If !ENABLE_NLS, make textomain() macro
return "messages" in case of a NULL argument. Patch by
Peter Kjellerstedt.
2009-01-17 Matthias Clasen <mclasen@redhat.com>
Bug 567838 G_STRUCT_OFFSETOF fails to compile under icc 9.1

View File

@ -23,7 +23,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
#define _(String) (String)
#define N_(String) (String)
#define P_(String) (String)
#define textdomain(String) (String)
#define textdomain(String) ((String) ? (String) : "messages")
#define gettext(String) (String)
#define dgettext(Domain,String) (String)
#define dcgettext(Domain,String,Type) (String)