From 6258bfd03d930e050ea64e0974be3955393231e9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 31 Mar 2008 03:55:50 +0000
Subject: [PATCH] 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=/branches/glib-2-16/; revision=6780
---
 ChangeLog        | 11 ++++++++++-
 glib/glibintl.h  |  1 +
 glib/gstrfuncs.c |  2 +-
 glib/gutils.c    |  1 -
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e32f4375b..8e1a2ab82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-30  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* 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>
 
 	Merged from trunk:
@@ -10,7 +19,7 @@
 	Merged from trunk:
 
 	* 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 8e6cdf082..4bed7c144 100644
--- 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 6d6038161..74419d9ad 100644
--- 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 f9f6e072c..d7eb1699d 100644
--- 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() */