glib r6780 - in branches/glib-2-16: . glib

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Mar 31 04:55:50 2008
New Revision: 6780
URL: http://svn.gnome.org/viewvc/glib?rev=6780&view=rev

Log:
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)


Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/glib/glibintl.h
   branches/glib-2-16/glib/gstrfuncs.c
   branches/glib-2-16/glib/gutils.c

Modified: branches/glib-2-16/glib/glibintl.h
==============================================================================
--- branches/glib-2-16/glib/glibintl.h	(original)
+++ branches/glib-2-16/glib/glibintl.h	Mon Mar 31 04:55:50 2008
@@ -27,6 +27,7 @@
 #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
 

Modified: branches/glib-2-16/glib/gstrfuncs.c
==============================================================================
--- branches/glib-2-16/glib/gstrfuncs.c	(original)
+++ branches/glib-2-16/glib/gstrfuncs.c	Mon Mar 31 04:55:50 2008
@@ -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"
 

Modified: branches/glib-2-16/glib/gutils.c
==============================================================================
--- branches/glib-2-16/glib/gutils.c	(original)
+++ branches/glib-2-16/glib/gutils.c	Mon Mar 31 04:55:50 2008
@@ -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() */