From 202d3af836610225b9b088b3f13678f860c72f56 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Sep 2002 15:26:39 +0000 Subject: [PATCH] update gettext.h from gettext.h --- lib/ChangeLog | 3 ++- lib/gettext.h | 40 +++++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index c8fee64f19..ff138a0d65 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -2,7 +2,8 @@ * strdup.c: copy from libc/string (via ../config/srclist*). * getopt*: copy from libc/posix. - * .cppi-disable: add strdup.c. + * gettext.h: copy from gettext. + * .cppi-disable: add strdup.c, gettext.h. 2002-07-01 Jim Meyering diff --git a/lib/gettext.h b/lib/gettext.h index babce049f1..8b262f4cfd 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -17,35 +17,45 @@ USA. */ #ifndef _LIBGETTEXT_H -# define _LIBGETTEXT_H 1 +#define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -# if ENABLE_NLS +#if ENABLE_NLS /* Get declarations of GNU message catalog functions. */ -# include +# include -# else +#else + +/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which + chokes if dcgettext is defined as a macro. So include it now, to make + later inclusions of a NOP. We don't include + as well because people using "gettext.h" will not include , + and also including would fail on SunOS 4, whereas + is OK. */ +#if defined(__sun) +# include +#endif /* Disabled NLS. The casts to 'const char *' serve the purpose of producing warnings for invalid uses of the value returned from these functions. On pre-ANSI systems without 'const', the config.h file is supposed to contain "#define const". */ -# define gettext(Msgid) ((const char *) (Msgid)) -# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) -# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) -# define ngettext(Msgid1, Msgid2, N) \ +# define gettext(Msgid) ((const char *) (Msgid)) +# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) +# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) +# define ngettext(Msgid1, Msgid2, N) \ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ +# define dngettext(Domainname, Msgid1, Msgid2, N) \ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ +# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define textdomain(Domainname) ((const char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) +# define textdomain(Domainname) ((const char *) (Domainname)) +# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) +# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) -# endif +#endif /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time @@ -54,6 +64,6 @@ and other string expressions won't work. The macro's expansion is not parenthesized, so that it is suitable as initializer for static 'char[]' or 'const char[]' variables. */ -# define gettext_noop(String) String +#define gettext_noop(String) String #endif /* _LIBGETTEXT_H */ -- 2.30.2