luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Matthias Clasen 2008-03-31 03:55:50 +00:00 committed by Matthias Clasen
parent 6d4536b293
commit 6258bfd03d
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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> 2008-03-30 Matthias Clasen <mclasen@redhat.com>
Merged from trunk: Merged from trunk:
@ -10,7 +19,7 @@
Merged from trunk: Merged from trunk:
* glib/gthread.h: Replace occurrances of G_GNUC_PRETTY_FUNCTION * 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> 2008-03-30 Matthias Clasen <mclasen@redhat.com>

1
glib/glibintl.h
View File

@ -27,6 +27,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str);
#define gettext(String) (String) #define gettext(String) (String)
#define dgettext(Domain,String) (String) #define dgettext(Domain,String) (String)
#define dcgettext(Domain,String,Type) (String) #define dcgettext(Domain,String,Type) (String)
#define dngettext(Domain,String1,String2,N) ((N) == 1 ? (String1) : (String2))
#define bindtextdomain(Domain,Directory) (Domain) #define bindtextdomain(Domain,Directory) (Domain)
#endif #endif

2
glib/gstrfuncs.c
View File

@ -42,11 +42,11 @@
#if !defined (HAVE_STRSIGNAL) || !defined(NO_SYS_SIGLIST_DECL) #if !defined (HAVE_STRSIGNAL) || !defined(NO_SYS_SIGLIST_DECL)
#include <signal.h> #include <signal.h>
#endif #endif
#include <libintl.h>
#include "glib.h" #include "glib.h"
#include "gprintf.h" #include "gprintf.h"
#include "gprintfint.h" #include "gprintfint.h"
#include "glibintl.h"
#include "galias.h" #include "galias.h"

1
glib/gutils.c
View File

@ -36,7 +36,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <libintl.h>
#include <locale.h> #include <locale.h>
#include <string.h> #include <string.h>
#include <ctype.h> /* For tolower() */ #include <ctype.h> /* For tolower() */