diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2001-10-21 16:29:13 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-10-21 16:29:13 +0000 |
| commit | 77c068446e143cc8f95e276eadee7528f3142105 (patch) | |
| tree | dfa7b9988fd3c5fba37514a5565ef80a3a944d04 /gcc/intl/loadmsgcat.c | |
| parent | 957569499bc92b4c796f0d112a134d90707a47b8 (diff) | |
| download | gcc-77c068446e143cc8f95e276eadee7528f3142105.zip gcc-77c068446e143cc8f95e276eadee7528f3142105.tar.gz gcc-77c068446e143cc8f95e276eadee7528f3142105.tar.bz2 | |
aclocal.m4 (AM_WITH_NLS): Also create and substitute INTLDEPS variable, which does not include $LIBICONV.
* aclocal.m4 (AM_WITH_NLS): Also create and substitute
INTLDEPS variable, which does not include $LIBICONV.
* Makefile.in: Use INTLDEPS in LIBDEPS.
* configure: Regenerate.
intl:
* dcigettext.c: Don't use #elif.
* gettextP.h: Prototype nls_uint32 and locale_charset here.
Always define ZERO to 1 to avoid warnings (ZERO is used in
flexible-array-member declarations).
* loadmsgcat.c: Apply __extension__ to structure definitions
using C99 designated initializer syntax.
Do not prototype locale_charset here.
* localcharset.c: Prototype get_charset_aliases before use.
Get rid of STATIC nonsense.
From-SVN: r46394
Diffstat (limited to 'gcc/intl/loadmsgcat.c')
| -rw-r--r-- | gcc/intl/loadmsgcat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/intl/loadmsgcat.c b/gcc/intl/loadmsgcat.c index 097624e..b6b13ff 100644 --- a/gcc/intl/loadmsgcat.c +++ b/gcc/intl/loadmsgcat.c @@ -136,13 +136,14 @@ int _nl_msg_cat_cntr; || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) /* These structs are the constant expression for the germanic plural - form determination. It represents the expression "n != 1". */ -static const struct expression plvar = + form determination. It represents the expression "n != 1". + GCC LOCAL: Use __extension__ to suppress -Wtraditional warnings. */ +__extension__ static const struct expression plvar = { .nargs = 0, .operation = var, }; -static const struct expression plone = +__extension__ static const struct expression plone = { .nargs = 0, .operation = num, @@ -151,7 +152,7 @@ static const struct expression plone = .num = 1 } }; -static struct expression germanic_plural = +__extension__ static struct expression germanic_plural = { .nargs = 2, .operation = not_equal, @@ -271,7 +272,6 @@ _nl_init_domain_conv (domain_file, domain, domainbinding) outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; # else # if HAVE_ICONV - extern const char *locale_charset (void); outcharset = locale_charset (); # endif # endif |