Simple fixes to help building GLib on embedded systems without NLS.

2008-03-30  Matthias Clasen  <mclasen@redhat.com>

        * glib/glibintl.h:
        * glib/gstrfuncs.c:
        * glib/gutils.c: Simple fixes to help building GLib on
        embedded systems without NLS.  (#524350, Peter Kjellerstedt)

svn path=/trunk/; revision=6779

diff --git a/ChangeLog b/ChangeLog
index ba28ad44ae1ec770cadafb297ba4d61b29dc4a7c..fc66709723b9ddd83ca75b875645c7185b8407ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-30  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glibintl.h:
+       * glib/gstrfuncs.c:
+       * glib/gutils.c: Simple fixes to help building GLib on 
+       embedded systems without NLS.  (#524350, Peter Kjellerstedt)
+
 2008-03-30  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/ghash.c: Fix the build with -DG_DISABLE_ASSERT.
@@ -6,7 +13,7 @@
 2008-03-30  Matthias Clasen  <mclasen@redhat.com>
        
        * glib/gthread.h: Replace occurrances of G_GNUC_PRETTY_FUNCTION
-       by G_STRFUNC.  (#524344, Peter, Kjellerstedt)
+       by G_STRFUNC.  (#524344, Peter Kjellerstedt)
 
 2008-03-30  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/glib/glibintl.h b/glib/glibintl.h
index 8e6cdf08246a1ec2a85ec46bbad0512c6524b4b5..4bed7c1444b533998306d064bee24d8a1fdf08c9 100644 (file)
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -27,6 +27,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
 #define gettext(String) (String)
 #define dgettext(Domain,String) (String)
 #define dcgettext(Domain,String,Type) (String)
+#define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2))
 #define bindtextdomain(Domain,Directory) (Domain) 
 #endif
 

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 6d60381612ef6198403d060e453b4ca0f134bfb6..74419d9ad4d0b9ed9d20a967ed619c9ba18718ac 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -42,11 +42,11 @@
 #if !defined (HAVE_STRSIGNAL) || !defined(NO_SYS_SIGLIST_DECL)
 #include <signal.h>
 #endif
-#include <libintl.h>
 
 #include "glib.h"
 #include "gprintf.h"
 #include "gprintfint.h"
+#include "glibintl.h"
 
 #include "galias.h"
 

diff --git a/glib/gutils.c b/glib/gutils.c
index f9f6e072caeb743d30a5f641cd16e8d3599c283f..d7eb1699db9bb8d4ec0a6f820360ccbc75235c7d 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -36,7 +36,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <libintl.h>
 #include <locale.h>
 #include <string.h>
 #include <ctype.h>             /* For tolower() */