Merge remote branch 'gvdb/master'

[platform/upstream/glib.git] / glib / gi18n-lib.h

diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index e5d1cd9..ca002a7 100644 (file)
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -16,21 +16,23 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef __G_I18N_LIB_H__
 #define __G_I18N_LIB_H__
 
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include <libintl.h>
+#include <string.h>
 
 #ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
+#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.  Did you forget to include config.h?
 #endif
 
-#define  _(String) dgettext (GETTEXT_PACKAGE, String)
-#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, NULL)
+#define  _(String) ((char *) g_dgettext (GETTEXT_PACKAGE, String))
+#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
 #define N_(String) (String)
-#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, String)
-
+#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
+#define NC_(Context, String) (String)
 
 #endif  /* __G_I18N_LIB_H__ */