libc/iconv: Remove unneeded pointer var for _iconv_aliases

The pointer value for the iconv alias data never changes, so get rid
of the pointer and make it an array instead.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard via Newlib 2020-07-09 16:58:46 -07:00 committed by Corinna Vinschen
parent 6c772f4547
commit 2c33d31fa8
2 changed files with 3 additions and 6 deletions

View File

@ -5,8 +5,8 @@
#include <_ansi.h> #include <_ansi.h>
#include "encnames.h" #include "encnames.h"
const char * const char
_iconv_aliases = _iconv_aliases[] =
{ {
#if defined (_ICONV_FROM_ENCODING_BIG5) \ #if defined (_ICONV_FROM_ENCODING_BIG5) \
|| defined (_ICONV_TO_ENCODING_BIG5) || defined (_ICONV_TO_ENCODING_BIG5)
@ -210,4 +210,3 @@ _iconv_aliases =
#endif #endif
"" ""
}; };

View File

@ -57,10 +57,8 @@ typedef __uint16_t ucs2_t;
/* 32-bit UCS-4 type */ /* 32-bit UCS-4 type */
typedef __uint32_t ucs4_t; typedef __uint32_t ucs4_t;
/* The list of built-in encoding names and aliases */ /* The list of built-in encoding names and aliases */
extern const char * extern const char _iconv_aliases[];
_iconv_aliases;
#endif /* !__ICONV_LIB_LOCAL_H__ */ #endif /* !__ICONV_LIB_LOCAL_H__ */