From 1da8112081679f27f0c96a8972124ee3728bd1c0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 18 Jan 2009 01:08:17 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ glib/glibintl.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7625824..53774b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-01-17 Matthias Clasen + 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 + Bug 567838 – G_STRUCT_OFFSETOF fails to compile under icc 9.1 * glib/gmacros.h (G_STRUCT_OFFSETOF): Use offsetof instead of diff --git a/glib/glibintl.h b/glib/glibintl.h index 0186723..3116f85 100644 --- a/glib/glibintl.h +++ b/glib/glibintl.h @@ -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) -- 2.7.4