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/localcharset.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/localcharset.c')
| -rw-r--r-- | gcc/intl/localcharset.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gcc/intl/localcharset.c b/gcc/intl/localcharset.c index 61f8f3e..07c5058 100644 --- a/gcc/intl/localcharset.c +++ b/gcc/intl/localcharset.c @@ -77,6 +77,9 @@ ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ static const char * volatile charset_aliases; +/* GCC LOCAL: Static function prototypes. */ +static const char *get_charset_aliases PARAMS ((void)); + /* Return a pointer to the contents of the charset.alias file. */ static const char * get_charset_aliases () @@ -194,11 +197,9 @@ get_charset_aliases () into one of the canonical names listed in config.charset. The result must not be freed; it is statically allocated. If the canonical name cannot be determined, the result is a non-canonical - name. */ + name. + GCC LOCAL: Get rid of STATIC nonsense. */ -#ifdef STATIC -STATIC -#endif const char * locale_charset () { |