Update gettext.h to fix warnings when compiling with --disable-nls

With the introduction of AX_COMPILE_FLAGS in configure.ac, building with
--disable-nls in configuration raises additional warnings.

This change updates gettext.h in order to address those warnings.
pull/22/head
nirenjan 2020-06-12 22:05:28 -07:00
parent 16a7801e59
commit f754533a67
1 changed files with 12 additions and 8 deletions

View File

@ -18,6 +18,10 @@
#ifndef _LIBGETTEXT_H #ifndef _LIBGETTEXT_H
#define _LIBGETTEXT_H 1 #define _LIBGETTEXT_H 1
#ifndef ENABLE_NLS
#define ENABLE_NLS 0
#endif
/* NLS can be disabled through the configure --disable-nls option. */ /* NLS can be disabled through the configure --disable-nls option. */
#if ENABLE_NLS #if ENABLE_NLS
@ -66,29 +70,29 @@
# undef gettext # undef gettext
# define gettext(Msgid) ((const char *) (Msgid)) # define gettext(Msgid) ((const char *) (Msgid))
# undef dgettext # undef dgettext
# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) # define dgettext(Domainname, Msgid) (gettext (Msgid))
# undef dcgettext # undef dcgettext
# define dcgettext(Domainname, Msgid, Category) \ # define dcgettext(Domainname, Msgid, Category) \
((void) (Category), dgettext (Domainname, Msgid)) (dgettext (Domainname, Msgid))
# undef ngettext # undef ngettext
# define ngettext(Msgid1, Msgid2, N) \ # define ngettext(Msgid1, Msgid2, N) \
((N) == 1 \ ((N) == 1 \
? ((void) (Msgid2), (const char *) (Msgid1)) \ ? ((const char *) (Msgid1)) \
: ((void) (Msgid1), (const char *) (Msgid2))) : ((const char *) (Msgid2)))
# undef dngettext # undef dngettext
# define dngettext(Domainname, Msgid1, Msgid2, N) \ # define dngettext(Domainname, Msgid1, Msgid2, N) \
((void) (Domainname), ngettext (Msgid1, Msgid2, N)) (ngettext (Msgid1, Msgid2, N))
# undef dcngettext # undef dcngettext
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N)) (dngettext (Domainname, Msgid1, Msgid2, N))
# undef textdomain # undef textdomain
# define textdomain(Domainname) ((const char *) (Domainname)) # define textdomain(Domainname) ((const char *) (Domainname))
# undef bindtextdomain # undef bindtextdomain
# define bindtextdomain(Domainname, Dirname) \ # define bindtextdomain(Domainname, Dirname) \
((void) (Domainname), (const char *) (Dirname)) (void)((void) (Domainname), (const char *) (Dirname))
# undef bind_textdomain_codeset # undef bind_textdomain_codeset
# define bind_textdomain_codeset(Domainname, Codeset) \ # define bind_textdomain_codeset(Domainname, Codeset) \
((void) (Domainname), (const char *) (Codeset)) (void)((void) (Domainname), (const char *) (Codeset))
#endif #endif