diff options
| author | Jim Meyering <jim@meyering.net> | 1996-06-14 03:30:28 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1996-06-14 03:30:28 +0000 |
| commit | 482f161a5c6b5f4f21493a84de70b1a8fecbb226 (patch) | |
| tree | 8b00ebbb63d24811174158fdaa10176bfd35d811 | |
| parent | 9b647bea250faf31f6e8d1a9cbe1dd362de73218 (diff) | |
| download | idutils-482f161a5c6b5f4f21493a84de70b1a8fecbb226.tar.gz idutils-482f161a5c6b5f4f21493a84de70b1a8fecbb226.tar.bz2 idutils-482f161a5c6b5f4f21493a84de70b1a8fecbb226.zip | |
merge with 0.10.18
| -rw-r--r-- | intl/ChangeLog | 7 | ||||
| -rw-r--r-- | intl/VERSION | 2 | ||||
| -rw-r--r-- | intl/explodename.c | 11 | ||||
| -rw-r--r-- | intl/l10nflist.c | 9 | ||||
| -rw-r--r-- | intl/libgettext.h | 8 |
5 files changed, 32 insertions, 5 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 1aa2a96..48d19da 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,5 +1,12 @@ +Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> + + * explodename.c, l10nflist.c: Define NULL for dumb systems. + Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> + * intlh.inst.in, libgettext.h (dcgettext): Rename local variable + result to __result to prevent name clash. + * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to get prototype for stpcpy and strcasecmp. diff --git a/intl/VERSION b/intl/VERSION index 20dd2ca..0c57d6f 100644 --- a/intl/VERSION +++ b/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.17 +GNU gettext library from gettext-0.10.18 diff --git a/intl/explodename.c b/intl/explodename.c index a51556e..64b0a03 100644 --- a/intl/explodename.c +++ b/intl/explodename.c @@ -26,6 +26,17 @@ Boston, MA 02111-1307, USA. */ #include "loadinfo.h" +/* On some strange systems still no definition of NULL is found. Sigh! */ +#ifndef NULL +# if defined __STDC__ && __STDC__ +# define NULL ((void *) 0) +# else +# define NULL 0 +# endif +#endif + +/* @@ end of prolog @@ */ + int _nl_explode_name (name, language, modifier, territory, codeset, normalized_codeset, special, sponsor, revision) diff --git a/intl/l10nflist.c b/intl/l10nflist.c index dc763cc..a874ef2 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -47,6 +47,15 @@ Boston, MA 02111-1307, USA. */ #include "loadinfo.h" +/* On some strange systems still no definition of NULL is found. Sigh! */ +#ifndef NULL +# if defined __STDC__ && __STDC__ +# define NULL ((void *) 0) +# else +# define NULL 0 +# endif +#endif + /* @@ end of prolog @@ */ #ifdef _LIBC diff --git a/intl/libgettext.h b/intl/libgettext.h index 05463ec..c9212aa 100644 --- a/intl/libgettext.h +++ b/intl/libgettext.h @@ -143,7 +143,7 @@ extern int _nl_msg_cat_cntr; # define dcgettext(Domainname, Msgid, Category) \ (__extension__ \ ({ \ - char *result; \ + char *__result; \ if (__builtin_constant_p (Msgid)) \ { \ static char *__translation__; \ @@ -154,11 +154,11 @@ extern int _nl_msg_cat_cntr; dcgettext__ ((Domainname), (Msgid), (Category)); \ __catalog_counter__ = _nl_msg_cat_cntr; \ } \ - result = __translation__; \ + __result = __translation__; \ } \ else \ - result = dcgettext__ ((Domainname), (Msgid), (Category)); \ - result; \ + __result = dcgettext__ ((Domainname), (Msgid), (Category)); \ + __result; \ })) # endif # endif |