[newlib-cygwin] ansification: remove _CONST
Yaakov Selkowitz
yselkowitz@sourceware.org
Wed Jan 17 17:48:00 GMT 2018
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0bda30e1ffd23488aa4a9b73f228089463fbee1a
commit 0bda30e1ffd23488aa4a9b73f228089463fbee1a
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sun Dec 3 20:25:16 2017 -0600
ansification: remove _CONST
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Diff:
---
newlib/libc/ctype/ctype_.c | 6 +-
newlib/libc/ctype/ctype_.h | 2 +-
newlib/libc/ctype/ctype_cp.h | 4 +-
newlib/libc/ctype/ctype_iso.h | 4 +-
newlib/libc/iconv/ccs/big5.c | 10 +--
newlib/libc/iconv/ccs/ccs.h | 10 +--
newlib/libc/iconv/ccs/ccsbi.c | 2 +-
newlib/libc/iconv/ccs/ccsbi.h | 82 +++++++++++------------
newlib/libc/iconv/ccs/cns11643_plane1.c | 10 +--
newlib/libc/iconv/ccs/cns11643_plane14.c | 10 +--
newlib/libc/iconv/ccs/cns11643_plane2.c | 10 +--
newlib/libc/iconv/ccs/cp775.c | 6 +-
newlib/libc/iconv/ccs/cp850.c | 6 +-
newlib/libc/iconv/ccs/cp852.c | 6 +-
newlib/libc/iconv/ccs/cp855.c | 6 +-
newlib/libc/iconv/ccs/cp866.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_1.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_10.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_11.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_13.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_14.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_15.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_2.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_3.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_4.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_5.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_6.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_7.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_8.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_9.c | 6 +-
newlib/libc/iconv/ccs/iso_ir_111.c | 6 +-
newlib/libc/iconv/ccs/jis_x0201_1976.c | 6 +-
newlib/libc/iconv/ccs/jis_x0208_1990.c | 10 +--
newlib/libc/iconv/ccs/jis_x0212_1990.c | 10 +--
newlib/libc/iconv/ccs/koi8_r.c | 6 +-
newlib/libc/iconv/ccs/koi8_ru.c | 6 +-
newlib/libc/iconv/ccs/koi8_u.c | 6 +-
newlib/libc/iconv/ccs/koi8_uni.c | 6 +-
newlib/libc/iconv/ccs/ksx1001.c | 10 +--
newlib/libc/iconv/ccs/mktbl.pl | 14 ++--
newlib/libc/iconv/ccs/win_1250.c | 6 +-
newlib/libc/iconv/ccs/win_1251.c | 6 +-
newlib/libc/iconv/ccs/win_1252.c | 6 +-
newlib/libc/iconv/ccs/win_1253.c | 6 +-
newlib/libc/iconv/ccs/win_1254.c | 6 +-
newlib/libc/iconv/ccs/win_1255.c | 6 +-
newlib/libc/iconv/ccs/win_1256.c | 6 +-
newlib/libc/iconv/ccs/win_1257.c | 6 +-
newlib/libc/iconv/ccs/win_1258.c | 6 +-
newlib/libc/iconv/ces/cesbi.c | 68 +++++++++----------
newlib/libc/iconv/ces/cesbi.h | 40 +++++------
newlib/libc/iconv/ces/euc.c | 18 ++---
newlib/libc/iconv/ces/mkdeps.pl | 24 +++----
newlib/libc/iconv/ces/table-pcs.c | 10 +--
newlib/libc/iconv/ces/table.c | 56 ++++++++--------
newlib/libc/iconv/ces/ucs-2-internal.c | 6 +-
newlib/libc/iconv/ces/ucs-2.c | 8 +--
newlib/libc/iconv/ces/ucs-4-internal.c | 6 +-
newlib/libc/iconv/ces/ucs-4.c | 8 +--
newlib/libc/iconv/ces/us-ascii.c | 6 +-
newlib/libc/iconv/ces/utf-16.c | 10 +--
newlib/libc/iconv/ces/utf-8.c | 8 +--
newlib/libc/iconv/lib/aliasesbi.c | 2 +-
newlib/libc/iconv/lib/aliasesi.c | 30 ++++-----
newlib/libc/iconv/lib/conv.h | 18 ++---
newlib/libc/iconv/lib/iconv.c | 18 ++---
newlib/libc/iconv/lib/iconvnls.c | 32 ++++-----
newlib/libc/iconv/lib/local.h | 2 +-
newlib/libc/iconv/lib/nullconv.c | 8 +--
newlib/libc/iconv/lib/ucsconv.c | 24 +++----
newlib/libc/iconv/lib/ucsconv.h | 26 +++----
newlib/libc/include/_ansi.h | 2 -
newlib/libc/include/ctype.h | 2 +-
newlib/libc/include/iconv.h | 6 +-
newlib/libc/include/pthread.h | 54 +++++++--------
newlib/libc/include/rpc/xdr.h | 10 +--
newlib/libc/include/stdio.h | 4 +-
newlib/libc/include/stdlib.h | 4 +-
newlib/libc/include/sys/errno.h | 2 +-
newlib/libc/include/sys/iconvnls.h | 12 ++--
newlib/libc/include/sys/reent.h | 2 +-
newlib/libc/include/unctrl.h | 4 +-
newlib/libc/locale/locale.c | 4 +-
newlib/libc/machine/cris/sys/errno.h | 2 +-
newlib/libc/machine/microblaze/strcmp.c | 4 +-
newlib/libc/machine/microblaze/strcpy.c | 6 +-
newlib/libc/machine/microblaze/strlen.c | 6 +-
newlib/libc/machine/powerpc/atosfix16.c | 4 +-
newlib/libc/machine/powerpc/atosfix32.c | 4 +-
newlib/libc/machine/powerpc/atosfix64.c | 4 +-
newlib/libc/machine/powerpc/atoufix16.c | 4 +-
newlib/libc/machine/powerpc/atoufix32.c | 4 +-
newlib/libc/machine/powerpc/atoufix64.c | 4 +-
newlib/libc/machine/powerpc/strtosfix16.c | 4 +-
newlib/libc/machine/powerpc/strtosfix32.c | 4 +-
newlib/libc/machine/powerpc/strtosfix64.c | 4 +-
newlib/libc/machine/powerpc/strtoufix16.c | 4 +-
newlib/libc/machine/powerpc/strtoufix32.c | 4 +-
newlib/libc/machine/powerpc/strtoufix64.c | 4 +-
newlib/libc/machine/powerpc/vfprintf.c | 8 +--
newlib/libc/machine/powerpc/vfscanf.c | 10 +--
newlib/libc/machine/spu/fdopen.c | 2 +-
newlib/libc/machine/spu/fopen.c | 8 +--
newlib/libc/machine/spu/fputs.c | 4 +-
newlib/libc/machine/spu/freopen.c | 4 +-
newlib/libc/machine/spu/fsetpos.c | 4 +-
newlib/libc/machine/spu/fwrite.c | 4 +-
newlib/libc/machine/spu/impure.c | 2 +-
newlib/libc/machine/spu/perror.c | 4 +-
newlib/libc/machine/spu/puts.c | 2 +-
newlib/libc/machine/spu/remove.c | 2 +-
newlib/libc/machine/spu/rename.c | 8 +--
newlib/libc/machine/spu/sys/errno.h | 2 +-
newlib/libc/machine/spu/vfprintf.c | 2 +-
newlib/libc/machine/spu/vfscanf.c | 2 +-
newlib/libc/machine/spu/vprintf.c | 4 +-
newlib/libc/machine/spu/vscanf.c | 2 +-
newlib/libc/machine/spu/vsnprintf.c | 4 +-
newlib/libc/machine/spu/vsprintf.c | 2 +-
newlib/libc/machine/spu/vsscanf.c | 8 +--
newlib/libc/machine/xscale/strlen.c | 2 +-
newlib/libc/misc/__dprintf.c | 4 +-
newlib/libc/misc/unctrl.c | 4 +-
newlib/libc/posix/execl.c | 14 ++--
newlib/libc/posix/execle.c | 18 ++---
newlib/libc/posix/execlp.c | 14 ++--
newlib/libc/posix/execv.c | 2 +-
newlib/libc/posix/execvp.c | 4 +-
newlib/libc/posix/posix_spawn.c | 52 +++++++-------
newlib/libc/reent/execr.c | 6 +-
newlib/libc/reent/impure.c | 2 +-
newlib/libc/reent/linkr.c | 4 +-
newlib/libc/reent/mkdirr.c | 2 +-
newlib/libc/reent/open64r.c | 2 +-
newlib/libc/reent/openr.c | 2 +-
newlib/libc/reent/renamer.c | 4 +-
newlib/libc/reent/stat64r.c | 2 +-
newlib/libc/reent/statr.c | 2 +-
newlib/libc/reent/unlinkr.c | 2 +-
newlib/libc/reent/writer.c | 2 +-
newlib/libc/search/bsearch.c | 4 +-
newlib/libc/signal/psignal.c | 2 +-
newlib/libc/stdio/fdopen.c | 4 +-
newlib/libc/stdio/fiscanf.c | 4 +-
newlib/libc/stdio/fopen.c | 8 +--
newlib/libc/stdio/fputs.c | 6 +-
newlib/libc/stdio/freopen.c | 4 +-
newlib/libc/stdio/fscanf.c | 4 +-
newlib/libc/stdio/fsetpos.c | 4 +-
newlib/libc/stdio/fvwrite.c | 2 +-
newlib/libc/stdio/fvwrite.h | 2 +-
newlib/libc/stdio/fwrite.c | 6 +-
newlib/libc/stdio/fwscanf.c | 4 +-
newlib/libc/stdio/iscanf.c | 4 +-
newlib/libc/stdio/local.h | 24 +++----
newlib/libc/stdio/nano-vfprintf.c | 14 ++--
newlib/libc/stdio/nano-vfprintf_float.c | 2 +-
newlib/libc/stdio/nano-vfprintf_i.c | 4 +-
newlib/libc/stdio/nano-vfprintf_local.h | 6 +-
newlib/libc/stdio/nano-vfscanf.c | 8 +--
newlib/libc/stdio/perror.c | 4 +-
newlib/libc/stdio/puts.c | 4 +-
newlib/libc/stdio/putw.c | 2 +-
newlib/libc/stdio/remove.c | 4 +-
newlib/libc/stdio/rename.c | 4 +-
newlib/libc/stdio/scanf.c | 4 +-
newlib/libc/stdio/siprintf.c | 8 +--
newlib/libc/stdio/siscanf.c | 16 ++---
newlib/libc/stdio/sniprintf.c | 8 +--
newlib/libc/stdio/snprintf.c | 8 +--
newlib/libc/stdio/sprintf.c | 8 +--
newlib/libc/stdio/sscanf.c | 16 ++---
newlib/libc/stdio/swprintf.c | 4 +-
newlib/libc/stdio/swscanf.c | 4 +-
newlib/libc/stdio/tmpnam.c | 14 ++--
newlib/libc/stdio/vfprintf.c | 34 +++++-----
newlib/libc/stdio/vfscanf.c | 10 +--
newlib/libc/stdio/vfwprintf.c | 16 ++---
newlib/libc/stdio/vfwscanf.c | 10 +--
newlib/libc/stdio/viprintf.c | 4 +-
newlib/libc/stdio/viscanf.c | 4 +-
newlib/libc/stdio/vprintf.c | 4 +-
newlib/libc/stdio/vscanf.c | 4 +-
newlib/libc/stdio/vsiscanf.c | 8 +--
newlib/libc/stdio/vsscanf.c | 8 +--
newlib/libc/stdio/vswscanf.c | 4 +-
newlib/libc/stdio/vwprintf.c | 4 +-
newlib/libc/stdio/vwscanf.c | 4 +-
newlib/libc/stdio/wscanf.c | 4 +-
newlib/libc/stdio64/fdopen64.c | 4 +-
newlib/libc/stdio64/fopen64.c | 8 +--
newlib/libc/stdio64/freopen64.c | 8 +--
newlib/libc/stdio64/fsetpos64.c | 4 +-
newlib/libc/stdlib/__exp10.c | 2 +-
newlib/libc/stdlib/atof.c | 2 +-
newlib/libc/stdlib/atoff.c | 2 +-
newlib/libc/stdlib/atoi.c | 4 +-
newlib/libc/stdlib/atol.c | 4 +-
newlib/libc/stdlib/atoll.c | 4 +-
newlib/libc/stdlib/gdtoa-gethex.c | 6 +-
newlib/libc/stdlib/gdtoa-hexnan.c | 12 ++--
newlib/libc/stdlib/getenv.c | 4 +-
newlib/libc/stdlib/getenv_r.c | 6 +-
newlib/libc/stdlib/ldtoa.c | 108 +++++++++++++++---------------
newlib/libc/stdlib/mprec.c | 14 ++--
newlib/libc/stdlib/mprec.h | 12 ++--
newlib/libc/stdlib/setenv.c | 6 +-
newlib/libc/stdlib/setenv_r.c | 6 +-
newlib/libc/stdlib/strtod.c | 14 ++--
newlib/libc/stdlib/strtol.c | 4 +-
newlib/libc/stdlib/strtoll.c | 6 +-
newlib/libc/stdlib/strtoul.c | 4 +-
newlib/libc/stdlib/strtoull.c | 4 +-
newlib/libc/stdlib/system.c | 10 +--
newlib/libc/stdlib/wcstod.c | 8 +--
newlib/libc/stdlib/wcstol.c | 4 +-
newlib/libc/stdlib/wcstoll.c | 4 +-
newlib/libc/stdlib/wcstoul.c | 4 +-
newlib/libc/stdlib/wcstoull.c | 4 +-
newlib/libc/string/bcmp.c | 4 +-
newlib/libc/string/bcopy.c | 2 +-
newlib/libc/string/index.c | 2 +-
newlib/libc/string/memccpy.c | 6 +-
newlib/libc/string/memchr.c | 4 +-
newlib/libc/string/memcmp.c | 4 +-
newlib/libc/string/memcpy.c | 6 +-
newlib/libc/string/memmove.c | 8 +--
newlib/libc/string/mempcpy.c | 6 +-
newlib/libc/string/memrchr.c | 4 +-
newlib/libc/string/rawmemchr.c | 4 +-
newlib/libc/string/rindex.c | 2 +-
newlib/libc/string/stpcpy.c | 4 +-
newlib/libc/string/stpncpy.c | 4 +-
newlib/libc/string/strcasecmp.c | 8 +--
newlib/libc/string/strcasestr.c | 4 +-
newlib/libc/string/strcat.c | 2 +-
newlib/libc/string/strchr.c | 4 +-
newlib/libc/string/strchrnul.c | 2 +-
newlib/libc/string/strcmp.c | 4 +-
newlib/libc/string/strcoll.c | 4 +-
newlib/libc/string/strcpy.c | 6 +-
newlib/libc/string/strcspn.c | 8 +--
newlib/libc/string/strdup.c | 2 +-
newlib/libc/string/strdup_r.c | 2 +-
newlib/libc/string/strlcat.c | 2 +-
newlib/libc/string/strlcpy.c | 2 +-
newlib/libc/string/strlen.c | 4 +-
newlib/libc/string/strncasecmp.c | 8 +--
newlib/libc/string/strncat.c | 2 +-
newlib/libc/string/strncmp.c | 4 +-
newlib/libc/string/strncpy.c | 8 +--
newlib/libc/string/strndup.c | 2 +-
newlib/libc/string/strndup_r.c | 4 +-
newlib/libc/string/strnlen.c | 4 +-
newlib/libc/string/strpbrk.c | 6 +-
newlib/libc/string/strrchr.c | 4 +-
newlib/libc/string/strspn.c | 8 +--
newlib/libc/string/strstr.c | 4 +-
newlib/libc/string/strxfrm.c | 2 +-
newlib/libc/string/swab.c | 2 +-
newlib/libc/string/wcpcpy.c | 2 +-
newlib/libc/string/wcpncpy.c | 2 +-
newlib/libc/string/wcscasecmp.c | 4 +-
newlib/libc/string/wcscat.c | 4 +-
newlib/libc/string/wcschr.c | 4 +-
newlib/libc/string/wcscmp.c | 4 +-
newlib/libc/string/wcscoll.c | 4 +-
newlib/libc/string/wcscpy.c | 4 +-
newlib/libc/string/wcscspn.c | 8 +--
newlib/libc/string/wcslcat.c | 4 +-
newlib/libc/string/wcslcpy.c | 4 +-
newlib/libc/string/wcslen.c | 4 +-
newlib/libc/string/wcsncasecmp.c | 4 +-
newlib/libc/string/wcsncat.c | 4 +-
newlib/libc/string/wcsncmp.c | 4 +-
newlib/libc/string/wcsncpy.c | 2 +-
newlib/libc/string/wcsnlen.c | 4 +-
newlib/libc/string/wcspbrk.c | 8 +--
newlib/libc/string/wcsrchr.c | 4 +-
newlib/libc/string/wcsspn.c | 8 +--
newlib/libc/string/wcsstr.c | 10 +--
newlib/libc/string/wcswidth.c | 2 +-
newlib/libc/string/wcsxfrm.c | 2 +-
newlib/libc/string/wcwidth.c | 4 +-
newlib/libc/string/wmemchr.c | 2 +-
newlib/libc/string/wmemcmp.c | 4 +-
newlib/libc/string/wmemcpy.c | 2 +-
newlib/libc/string/wmemmove.c | 2 +-
newlib/libc/string/wmempcpy.c | 2 +-
newlib/libc/sys/linux/getpwent.c | 2 +-
newlib/libc/sys/linux/pwrite.c | 4 +-
newlib/libc/sys/linux/sys/errno.h | 2 +-
newlib/libc/sys/phoenix/sys/errno.h | 2 +-
newlib/libc/syscalls/sysexecve.c | 6 +-
newlib/libc/syscalls/syslink.c | 4 +-
newlib/libc/syscalls/sysstat.c | 2 +-
newlib/libc/syscalls/sysunlink.c | 2 +-
newlib/libc/time/asctime.c | 2 +-
newlib/libc/time/asctime_r.c | 6 +-
newlib/libc/time/ctime.c | 2 +-
newlib/libc/time/ctime_r.c | 2 +-
newlib/libc/time/gmtime.c | 2 +-
newlib/libc/time/gmtime_r.c | 4 +-
newlib/libc/time/lcltime.c | 2 +-
newlib/libc/time/lcltime_r.c | 6 +-
newlib/libc/time/local.h | 2 +-
newlib/libc/time/mktime.c | 4 +-
newlib/libc/time/month_lengths.c | 2 +-
newlib/libc/time/strftime.c | 8 +--
newlib/libc/time/strptime.c | 2 +-
newlib/libc/time/tzcalc_limits.c | 6 +-
newlib/libc/unix/getut.c | 2 +-
newlib/libc/unix/pwrite.c | 4 +-
newlib/libc/xdr/xdr_mem.c | 24 +++----
newlib/libc/xdr/xdr_private.c | 4 +-
newlib/libc/xdr/xdr_rec.c | 14 ++--
newlib/libc/xdr/xdr_sizeof.c | 4 +-
newlib/libc/xdr/xdr_stdio.c | 14 ++--
newlib/libm/test/string.c | 2 +-
newlib/libm/test/test.c | 4 +-
newlib/libm/test/test.h | 2 +-
winsup/cygwin/libc/strptime.cc | 2 +-
322 files changed, 1145 insertions(+), 1147 deletions(-)
diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
index 9e3cdcf..28727e8 100644
--- a/newlib/libc/ctype/ctype_.c
+++ b/newlib/libc/ctype/ctype_.c
@@ -87,7 +87,7 @@ static char sccsid[] = "@(#)ctype_.c 5.6 (Berkeley) 6/1/90";
/* No static const on Cygwin since it's referenced and potentially overwritten
for compatibility with older applications. */
#ifndef __CYGWIN__
-_CONST
+const
#endif
char _ctype_b[128 + 256] = {
_CTYPE_DATA_128_255,
@@ -116,7 +116,7 @@ __asm__ (" \n\
# endif
# else /* !__CYGWIN__ */
-_CONST char _ctype_[1 + 256] = {
+const char _ctype_[1 + 256] = {
0,
_CTYPE_DATA_0_127,
_CTYPE_DATA_128_255
@@ -125,7 +125,7 @@ _CONST char _ctype_[1 + 256] = {
#else /* !ALLOW_NEGATIVE_CTYPE_INDEX */
-_CONST char _ctype_[1 + 256] = {
+const char _ctype_[1 + 256] = {
0,
_CTYPE_DATA_0_127,
_CTYPE_DATA_128_255
diff --git a/newlib/libc/ctype/ctype_.h b/newlib/libc/ctype/ctype_.h
index 5356d38..a73870b 100644
--- a/newlib/libc/ctype/ctype_.h
+++ b/newlib/libc/ctype/ctype_.h
@@ -7,7 +7,7 @@
#ifdef ALLOW_NEGATIVE_CTYPE_INDEX
#ifndef __CYGWIN__
- extern _CONST char _ctype_b[];
+ extern const char _ctype_b[];
#else
extern char _ctype_b[];
#endif
diff --git a/newlib/libc/ctype/ctype_cp.h b/newlib/libc/ctype/ctype_cp.h
index 004c1e2..9370778 100644
--- a/newlib/libc/ctype/ctype_cp.h
+++ b/newlib/libc/ctype/ctype_cp.h
@@ -473,7 +473,7 @@
#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
#ifndef __CYGWIN__
-static _CONST
+static const
#endif
char __ctype_cp[26][128 + 256] = {
{ _CTYPE_CP437_128_254,
@@ -636,7 +636,7 @@ char __ctype_cp[26][128 + 256] = {
#else /* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
-static _CONST char __ctype_cp[26][1 + 256] = {
+static const char __ctype_cp[26][1 + 256] = {
{ 0,
_CTYPE_DATA_0_127,
_CTYPE_CP437_128_254,
diff --git a/newlib/libc/ctype/ctype_iso.h b/newlib/libc/ctype/ctype_iso.h
index ed1d5d6..60087dc 100644
--- a/newlib/libc/ctype/ctype_iso.h
+++ b/newlib/libc/ctype/ctype_iso.h
@@ -277,7 +277,7 @@ extern int __iso_8859_index (const char *charset_ext);
#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
#ifndef __CYGWIN__
-static _CONST
+static const
#endif
char __ctype_iso[15][128 + 256] = {
{ _CTYPE_ISO_8859_1_128_254,
@@ -374,7 +374,7 @@ char __ctype_iso[15][128 + 256] = {
#else /* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
-static _CONST char __ctype_iso[15][1 + 256] = {
+static const char __ctype_iso[15][1 + 256] = {
{ 0,
_CTYPE_DATA_0_127,
_CTYPE_ISO_8859_1_128_254,
diff --git a/newlib/libc/iconv/ccs/big5.c b/newlib/libc/iconv/ccs/big5.c
index 45ea59b..02b20a1 100644
--- a/newlib/libc/iconv/ccs/big5.c
+++ b/newlib/libc/iconv/ccs/big5.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_BIG5) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_big5[] =
{
/* Heading Block */
@@ -2972,7 +2972,7 @@ to_ucs_speed_big5[] =
#if defined (ICONV_TO_UCS_CCS_BIG5) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_big5[] =
{
0x00B0, /* Ranges number */
@@ -5092,7 +5092,7 @@ to_ucs_size_big5[] =
#if defined (ICONV_FROM_UCS_CCS_BIG5) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_big5[] =
{
/* Heading Block */
@@ -8407,7 +8407,7 @@ from_ucs_speed_big5[] =
#if defined (ICONV_FROM_UCS_CCS_BIG5) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_big5[] =
{
0x0235, /* Ranges number */
@@ -12579,7 +12579,7 @@ from_ucs_size_big5[] =
* big5 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_big5 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/ccs.h b/newlib/libc/iconv/ccs/ccs.h
index d17f4ab..c640b64 100644
--- a/newlib/libc/iconv/ccs/ccs.h
+++ b/newlib/libc/iconv/ccs/ccs.h
@@ -131,12 +131,12 @@
typedef struct
{
__uint16_t ver; /* Table version */
- _CONST char *name; /* CCS name */
+ const char *name; /* CCS name */
__uint16_t bits; /* CCS's bits number */
int from_ucs_type; /* UCS -> CCS table optimization type */
- _CONST __uint16_t *from_ucs; /* UCS -> CCS table */
+ const __uint16_t *from_ucs; /* UCS -> CCS table */
int to_ucs_type; /* CCS -> UCS table optimization type */
- _CONST __uint16_t *to_ucs; /* CCS -> UCS table */
+ const __uint16_t *to_ucs; /* CCS -> UCS table */
} iconv_ccs_t;
/*
@@ -147,11 +147,11 @@ typedef struct
int bits; /* CCS's bits number */
int type; /* Table type (builtin/external) */
int optimization; /* Table optimization type (speed/size) */
- _CONST __uint16_t *tbl; /* Table's data */
+ const __uint16_t *tbl; /* Table's data */
} iconv_ccs_desc_t;
/* Array containing all built-in CCS tables */
-extern _CONST iconv_ccs_t *
+extern const iconv_ccs_t *
_iconv_ccs[];
#endif /* __CCS_H__ */
diff --git a/newlib/libc/iconv/ccs/ccsbi.c b/newlib/libc/iconv/ccs/ccsbi.c
index d79a2ce..6bb489a 100644
--- a/newlib/libc/iconv/ccs/ccsbi.c
+++ b/newlib/libc/iconv/ccs/ccsbi.c
@@ -8,7 +8,7 @@
/*
* The following array contains the list of built-in CCS tables.
*/
-_CONST iconv_ccs_t *
+const iconv_ccs_t *
_iconv_ccs[] =
{
#if defined (ICONV_TO_UCS_CCS_CP775) \
diff --git a/newlib/libc/iconv/ccs/ccsbi.h b/newlib/libc/iconv/ccs/ccsbi.h
index 268cac3..97a88a0 100644
--- a/newlib/libc/iconv/ccs/ccsbi.h
+++ b/newlib/libc/iconv/ccs/ccsbi.h
@@ -310,207 +310,207 @@
*/
#if defined (ICONV_TO_UCS_CCS_BIG5) \
|| defined (ICONV_FROM_UCS_CCS_BIG5)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_big5;
#endif
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
|| defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cns11643_plane1;
#endif
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
|| defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cns11643_plane14;
#endif
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
|| defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cns11643_plane2;
#endif
#if defined (ICONV_TO_UCS_CCS_CP775) \
|| defined (ICONV_FROM_UCS_CCS_CP775)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp775;
#endif
#if defined (ICONV_TO_UCS_CCS_CP850) \
|| defined (ICONV_FROM_UCS_CCS_CP850)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp850;
#endif
#if defined (ICONV_TO_UCS_CCS_CP852) \
|| defined (ICONV_FROM_UCS_CCS_CP852)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp852;
#endif
#if defined (ICONV_TO_UCS_CCS_CP855) \
|| defined (ICONV_FROM_UCS_CCS_CP855)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp855;
#endif
#if defined (ICONV_TO_UCS_CCS_CP866) \
|| defined (ICONV_FROM_UCS_CCS_CP866)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp866;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_1) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_1;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_10) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_10;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_11) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_11;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_13) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_13;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_14) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_14;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_15) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_15;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_2) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_2;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_3) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_3;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_4) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_4;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_5) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_5;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_6) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_6;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_7) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_7;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_8) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_8;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_9) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_9;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_IR_111) \
|| defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_ir_111;
#endif
#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976) \
|| defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_jis_x0201_1976;
#endif
#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
|| defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_jis_x0208_1990;
#endif
#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
|| defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_jis_x0212_1990;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_R) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_R)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_r;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_RU) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_ru;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_U) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_U)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_u;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_UNI) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_uni;
#endif
#if defined (ICONV_TO_UCS_CCS_KSX1001) \
|| defined (ICONV_FROM_UCS_CCS_KSX1001)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_ksx1001;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1250) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1250)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1250;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1251) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1251)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1251;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1252) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1252)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1252;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1253) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1253)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1253;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1254) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1254)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1254;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1255) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1255)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1255;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1256) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1256)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1256;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1257) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1257)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1257;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1258) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1258)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1258;
#endif
diff --git a/newlib/libc/iconv/ccs/cns11643_plane1.c b/newlib/libc/iconv/ccs/cns11643_plane1.c
index 37e31a9..da1c059 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane1.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane1.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cns11643_plane1[] =
{
/* Heading Block */
@@ -2213,7 +2213,7 @@ to_ucs_speed_cns11643_plane1[] =
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_cns11643_plane1[] =
{
0x0042, /* Ranges number */
@@ -3118,7 +3118,7 @@ to_ucs_size_cns11643_plane1[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_cns11643_plane1[] =
{
/* Heading Block */
@@ -6367,7 +6367,7 @@ from_ucs_speed_cns11643_plane1[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_cns11643_plane1[] =
{
0x017D, /* Ranges number */
@@ -11175,7 +11175,7 @@ from_ucs_size_cns11643_plane1[] =
* cns11643_plane1 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cns11643_plane1 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane14.c b/newlib/libc/iconv/ccs/cns11643_plane14.c
index 18230d5..507cdef 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane14.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane14.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cns11643_plane14[] =
{
/* Heading Block */
@@ -2411,7 +2411,7 @@ to_ucs_speed_cns11643_plane14[] =
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_cns11643_plane14[] =
{
0x00DE, /* Ranges number */
@@ -4011,7 +4011,7 @@ to_ucs_size_cns11643_plane14[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_cns11643_plane14[] =
{
/* Heading Block */
@@ -6765,7 +6765,7 @@ from_ucs_speed_cns11643_plane14[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_cns11643_plane14[] =
{
0x00C5, /* Ranges number */
@@ -10727,7 +10727,7 @@ from_ucs_size_cns11643_plane14[] =
* cns11643_plane14 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cns11643_plane14 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane2.c b/newlib/libc/iconv/ccs/cns11643_plane2.c
index c591ce3..15c287f 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane2.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane2.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cns11643_plane2[] =
{
/* Heading Block */
@@ -2774,7 +2774,7 @@ to_ucs_speed_cns11643_plane2[] =
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_cns11643_plane2[] =
{
0x0052, /* Ranges number */
@@ -3936,7 +3936,7 @@ to_ucs_size_cns11643_plane2[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_cns11643_plane2[] =
{
/* Heading Block */
@@ -6690,7 +6690,7 @@ from_ucs_speed_cns11643_plane2[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_cns11643_plane2[] =
{
0x027E, /* Ranges number */
@@ -11912,7 +11912,7 @@ from_ucs_size_cns11643_plane2[] =
* cns11643_plane2 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cns11643_plane2 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp775.c b/newlib/libc/iconv/ccs/cp775.c
index c35a87c..f7c4af5 100644
--- a/newlib/libc/iconv/ccs/cp775.c
+++ b/newlib/libc/iconv/ccs/cp775.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP775)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp775[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp775[] =
#if defined (ICONV_FROM_UCS_CCS_CP775)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp775[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_cp775[] =
* cp775 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp775 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp850.c b/newlib/libc/iconv/ccs/cp850.c
index 305ae85..57f5906 100644
--- a/newlib/libc/iconv/ccs/cp850.c
+++ b/newlib/libc/iconv/ccs/cp850.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP850)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp850[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp850[] =
#if defined (ICONV_FROM_UCS_CCS_CP850)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp850[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp850[] =
* cp850 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp850 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp852.c b/newlib/libc/iconv/ccs/cp852.c
index 73a1e0f..c622da4 100644
--- a/newlib/libc/iconv/ccs/cp852.c
+++ b/newlib/libc/iconv/ccs/cp852.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP852)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp852[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp852[] =
#if defined (ICONV_FROM_UCS_CCS_CP852)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp852[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp852[] =
* cp852 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp852 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp855.c b/newlib/libc/iconv/ccs/cp855.c
index 2add727..41c52ed 100644
--- a/newlib/libc/iconv/ccs/cp855.c
+++ b/newlib/libc/iconv/ccs/cp855.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP855)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp855[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp855[] =
#if defined (ICONV_FROM_UCS_CCS_CP855)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp855[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp855[] =
* cp855 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp855 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp866.c b/newlib/libc/iconv/ccs/cp866.c
index 678ea42..c1dacd8 100644
--- a/newlib/libc/iconv/ccs/cp866.c
+++ b/newlib/libc/iconv/ccs/cp866.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP866)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp866[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp866[] =
#if defined (ICONV_FROM_UCS_CCS_CP866)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp866[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_cp866[] =
* cp866 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp866 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_1.c b/newlib/libc/iconv/ccs/iso_8859_1.c
index a239477..775bca6 100644
--- a/newlib/libc/iconv/ccs/iso_8859_1.c
+++ b/newlib/libc/iconv/ccs/iso_8859_1.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_1)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_1[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_1[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_1[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -185,7 +185,7 @@ from_ucs_speed_iso_8859_1[] =
* iso_8859_1 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_1 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_10.c b/newlib/libc/iconv/ccs/iso_8859_10.c
index 1848afd..b221a6a 100644
--- a/newlib/libc/iconv/ccs/iso_8859_10.c
+++ b/newlib/libc/iconv/ccs/iso_8859_10.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_10)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_10[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_10[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_10[] =
{
W(0x0138), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_10[] =
* iso_8859_10 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_10 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_11.c b/newlib/libc/iconv/ccs/iso_8859_11.c
index 97cc075..ebb5ec6 100644
--- a/newlib/libc/iconv/ccs/iso_8859_11.c
+++ b/newlib/libc/iconv/ccs/iso_8859_11.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_11)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_11[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_11[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_11[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_11[] =
* iso_8859_11 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_11 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_13.c b/newlib/libc/iconv/ccs/iso_8859_13.c
index 88a2a6f..3905cef 100644
--- a/newlib/libc/iconv/ccs/iso_8859_13.c
+++ b/newlib/libc/iconv/ccs/iso_8859_13.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_13)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_13[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_13[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_13[] =
{
W(0x2019), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_13[] =
* iso_8859_13 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_13 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_14.c b/newlib/libc/iconv/ccs/iso_8859_14.c
index 28052a7..114d2df 100644
--- a/newlib/libc/iconv/ccs/iso_8859_14.c
+++ b/newlib/libc/iconv/ccs/iso_8859_14.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_14)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_14[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_14[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_14[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_14[] =
* iso_8859_14 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_14 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_15.c b/newlib/libc/iconv/ccs/iso_8859_15.c
index da3cfc3..52dff02 100644
--- a/newlib/libc/iconv/ccs/iso_8859_15.c
+++ b/newlib/libc/iconv/ccs/iso_8859_15.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_15)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_15[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_15[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_15[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_15[] =
* iso_8859_15 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_15 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_2.c b/newlib/libc/iconv/ccs/iso_8859_2.c
index 5a19666..ecb374e 100644
--- a/newlib/libc/iconv/ccs/iso_8859_2.c
+++ b/newlib/libc/iconv/ccs/iso_8859_2.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_2)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_2[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_2[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_2[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_2[] =
* iso_8859_2 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_2 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_3.c b/newlib/libc/iconv/ccs/iso_8859_3.c
index a69fcb3..6f80034 100644
--- a/newlib/libc/iconv/ccs/iso_8859_3.c
+++ b/newlib/libc/iconv/ccs/iso_8859_3.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_3)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_3[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_3[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_3[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_3[] =
* iso_8859_3 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_3 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_4.c b/newlib/libc/iconv/ccs/iso_8859_4.c
index 0cec458..b080e2d 100644
--- a/newlib/libc/iconv/ccs/iso_8859_4.c
+++ b/newlib/libc/iconv/ccs/iso_8859_4.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_4)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_4[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_4[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_4[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_4[] =
* iso_8859_4 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_4 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_5.c b/newlib/libc/iconv/ccs/iso_8859_5.c
index e4765ff..b4b0c3f 100644
--- a/newlib/libc/iconv/ccs/iso_8859_5.c
+++ b/newlib/libc/iconv/ccs/iso_8859_5.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_5)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_5[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_5[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_5[] =
{
W(0x045F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_5[] =
* iso_8859_5 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_5 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_6.c b/newlib/libc/iconv/ccs/iso_8859_6.c
index 783cf1f..9967841 100644
--- a/newlib/libc/iconv/ccs/iso_8859_6.c
+++ b/newlib/libc/iconv/ccs/iso_8859_6.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_6)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_6[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_6[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_6[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_6[] =
* iso_8859_6 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_6 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_7.c b/newlib/libc/iconv/ccs/iso_8859_7.c
index e964a02..41d3400 100644
--- a/newlib/libc/iconv/ccs/iso_8859_7.c
+++ b/newlib/libc/iconv/ccs/iso_8859_7.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_7)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_7[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_7[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_7[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_7[] =
* iso_8859_7 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_7 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_8.c b/newlib/libc/iconv/ccs/iso_8859_8.c
index bf49604..029a4b8 100644
--- a/newlib/libc/iconv/ccs/iso_8859_8.c
+++ b/newlib/libc/iconv/ccs/iso_8859_8.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_8)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_8[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_8[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_8[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_8[] =
* iso_8859_8 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_8 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_9.c b/newlib/libc/iconv/ccs/iso_8859_9.c
index 20fbb84..b787b98 100644
--- a/newlib/libc/iconv/ccs/iso_8859_9.c
+++ b/newlib/libc/iconv/ccs/iso_8859_9.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_9)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_9[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_9[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_9[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_9[] =
* iso_8859_9 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_9 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_ir_111.c b/newlib/libc/iconv/ccs/iso_ir_111.c
index 0e9bcc4..7d05ef4 100644
--- a/newlib/libc/iconv/ccs/iso_ir_111.c
+++ b/newlib/libc/iconv/ccs/iso_ir_111.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_IR_111)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_ir_111[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_ir_111[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_ir_111[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_ir_111[] =
* iso_ir_111 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_ir_111 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0201_1976.c b/newlib/libc/iconv/ccs/jis_x0201_1976.c
index e5cdb5f..ca94986 100644
--- a/newlib/libc/iconv/ccs/jis_x0201_1976.c
+++ b/newlib/libc/iconv/ccs/jis_x0201_1976.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_jis_x0201_1976[] =
{
INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
@@ -75,7 +75,7 @@ to_ucs_speed_jis_x0201_1976[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_jis_x0201_1976[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -185,7 +185,7 @@ from_ucs_speed_jis_x0201_1976[] =
* jis_x0201_1976 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_jis_x0201_1976 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0208_1990.c b/newlib/libc/iconv/ccs/jis_x0208_1990.c
index c12d134..070e0e4 100644
--- a/newlib/libc/iconv/ccs/jis_x0208_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0208_1990.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_jis_x0208_1990[] =
{
/* Heading Block */
@@ -2609,7 +2609,7 @@ to_ucs_speed_jis_x0208_1990[] =
#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_jis_x0208_1990[] =
{
0x0055, /* Ranges number */
@@ -3684,7 +3684,7 @@ to_ucs_size_jis_x0208_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_jis_x0208_1990[] =
{
/* Heading Block */
@@ -6801,7 +6801,7 @@ from_ucs_speed_jis_x0208_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_jis_x0208_1990[] =
{
0x01E9, /* Ranges number */
@@ -12125,7 +12125,7 @@ from_ucs_size_jis_x0208_1990[] =
* jis_x0208_1990 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_jis_x0208_1990 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0212_1990.c b/newlib/libc/iconv/ccs/jis_x0212_1990.c
index eb8882f..613de7d 100644
--- a/newlib/libc/iconv/ccs/jis_x0212_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0212_1990.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_jis_x0212_1990[] =
{
/* Heading Block */
@@ -2312,7 +2312,7 @@ to_ucs_speed_jis_x0212_1990[] =
#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_jis_x0212_1990[] =
{
0x0049, /* Ranges number */
@@ -3262,7 +3262,7 @@ to_ucs_size_jis_x0212_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_jis_x0212_1990[] =
{
/* Heading Block */
@@ -6214,7 +6214,7 @@ from_ucs_speed_jis_x0212_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_jis_x0212_1990[] =
{
0x01AA, /* Ranges number */
@@ -11349,7 +11349,7 @@ from_ucs_size_jis_x0212_1990[] =
* jis_x0212_1990 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_jis_x0212_1990 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_r.c b/newlib/libc/iconv/ccs/koi8_r.c
index cccb7c1..698652e 100644
--- a/newlib/libc/iconv/ccs/koi8_r.c
+++ b/newlib/libc/iconv/ccs/koi8_r.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_R)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_r[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_r[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_R)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_r[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_koi8_r[] =
* koi8_r CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_r =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_ru.c b/newlib/libc/iconv/ccs/koi8_ru.c
index 704ce95..956dc78 100644
--- a/newlib/libc/iconv/ccs/koi8_ru.c
+++ b/newlib/libc/iconv/ccs/koi8_ru.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_RU)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_ru[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_ru[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_ru[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_koi8_ru[] =
* koi8_ru CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_ru =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_u.c b/newlib/libc/iconv/ccs/koi8_u.c
index ebe0c91..d271e7e 100644
--- a/newlib/libc/iconv/ccs/koi8_u.c
+++ b/newlib/libc/iconv/ccs/koi8_u.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_U)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_u[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_u[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_U)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_u[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_koi8_u[] =
* koi8_u CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_u =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_uni.c b/newlib/libc/iconv/ccs/koi8_uni.c
index 5596c2d..4523d1c 100644
--- a/newlib/libc/iconv/ccs/koi8_uni.c
+++ b/newlib/libc/iconv/ccs/koi8_uni.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_UNI)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_uni[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_uni[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_uni[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_koi8_uni[] =
* koi8_uni CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_uni =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/ksx1001.c b/newlib/libc/iconv/ccs/ksx1001.c
index ad2c30d..5690e4a 100644
--- a/newlib/libc/iconv/ccs/ksx1001.c
+++ b/newlib/libc/iconv/ccs/ksx1001.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_KSX1001) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_ksx1001[] =
{
/* Heading Block */
@@ -3005,7 +3005,7 @@ to_ucs_speed_ksx1001[] =
#if defined (ICONV_TO_UCS_CCS_KSX1001) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_ksx1001[] =
{
0x005D, /* Ranges number */
@@ -4266,7 +4266,7 @@ to_ucs_size_ksx1001[] =
#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_ksx1001[] =
{
/* Heading Block */
@@ -9099,7 +9099,7 @@ from_ucs_speed_ksx1001[] =
#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_ksx1001[] =
{
0x01B6, /* Ranges number */
@@ -15576,7 +15576,7 @@ from_ucs_size_ksx1001[] =
* ksx1001 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_ksx1001 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/mktbl.pl b/newlib/libc/iconv/ccs/mktbl.pl
index c3b8793..633511e 100755
--- a/newlib/libc/iconv/ccs/mktbl.pl
+++ b/newlib/libc/iconv/ccs/mktbl.pl
@@ -343,7 +343,7 @@ if ($Source)
* $CCSName CCS description table.
* $Separator
*/
-_CONST $TypeBICCS
+const $TypeBICCS
$VarBICCS =
{
\t$MacroVer1Table, /* Table version */
@@ -807,7 +807,7 @@ sub Output8bitToUCS(;$)
*/
#if defined ($GuardToUCS)
-static _CONST __uint16_t
+static const __uint16_t
${VarToUCSSpeed}\[] =
{\n\t";
}
@@ -872,7 +872,7 @@ sub Output8bitFromUCS(;$)
#if defined ($GuardFromUCS)
-static _CONST unsigned char
+static const unsigned char
${VarFromUCSSpeed}\[] =
{
";
@@ -995,7 +995,7 @@ sub OutputSpeed($;$)
#if defined ($GuardToUCS) \\
&& !($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarToUCSSpeed}\[] =
{
";
@@ -1018,7 +1018,7 @@ ${VarToUCSSpeed}\[] =
#if defined ($GuardFromUCS) \\
&& !($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarFromUCSSpeed}\[] =
{
";
@@ -1149,7 +1149,7 @@ sub OutputSize($;$)
#if defined ($GuardToUCS) \\
&& ($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarToUCSSize}\[] =
{
";
@@ -1171,7 +1171,7 @@ ${VarToUCSSize}\[] =
#if defined ($GuardFromUCS) \\
&& ($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarFromUCSSize}\[] =
{
";
diff --git a/newlib/libc/iconv/ccs/win_1250.c b/newlib/libc/iconv/ccs/win_1250.c
index e43eb8d..d86d6a0 100644
--- a/newlib/libc/iconv/ccs/win_1250.c
+++ b/newlib/libc/iconv/ccs/win_1250.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1250)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1250[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1250[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1250)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1250[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1250[] =
* win_1250 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1250 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1251.c b/newlib/libc/iconv/ccs/win_1251.c
index 7e9b4c3..195fc0a 100644
--- a/newlib/libc/iconv/ccs/win_1251.c
+++ b/newlib/libc/iconv/ccs/win_1251.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1251)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1251[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1251[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1251)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1251[] =
{
W(0x044F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_win_1251[] =
* win_1251 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1251 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1252.c b/newlib/libc/iconv/ccs/win_1252.c
index 659054f..463cabd 100644
--- a/newlib/libc/iconv/ccs/win_1252.c
+++ b/newlib/libc/iconv/ccs/win_1252.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1252)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1252[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1252[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1252)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1252[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1252[] =
* win_1252 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1252 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1253.c b/newlib/libc/iconv/ccs/win_1253.c
index 4508133..c9abd81 100644
--- a/newlib/libc/iconv/ccs/win_1253.c
+++ b/newlib/libc/iconv/ccs/win_1253.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1253)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1253[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1253[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1253)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1253[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1253[] =
* win_1253 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1253 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1254.c b/newlib/libc/iconv/ccs/win_1254.c
index 3c1599a..05ed88e 100644
--- a/newlib/libc/iconv/ccs/win_1254.c
+++ b/newlib/libc/iconv/ccs/win_1254.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1254)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1254[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1254[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1254)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1254[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1254[] =
* win_1254 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1254 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1255.c b/newlib/libc/iconv/ccs/win_1255.c
index 937afca..47e9c01 100644
--- a/newlib/libc/iconv/ccs/win_1255.c
+++ b/newlib/libc/iconv/ccs/win_1255.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1255)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1255[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1255[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1255)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1255[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1255[] =
* win_1255 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1255 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1256.c b/newlib/libc/iconv/ccs/win_1256.c
index 44d4519..93a1f07 100644
--- a/newlib/libc/iconv/ccs/win_1256.c
+++ b/newlib/libc/iconv/ccs/win_1256.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1256)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1256[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1256[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1256)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1256[] =
{
W(0x06D2), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1256[] =
* win_1256 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1256 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1257.c b/newlib/libc/iconv/ccs/win_1257.c
index ad497cb..4f9fa39 100644
--- a/newlib/libc/iconv/ccs/win_1257.c
+++ b/newlib/libc/iconv/ccs/win_1257.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1257)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1257[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1257[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1257)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1257[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1257[] =
* win_1257 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1257 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1258.c b/newlib/libc/iconv/ccs/win_1258.c
index 7331d78..42ec247 100644
--- a/newlib/libc/iconv/ccs/win_1258.c
+++ b/newlib/libc/iconv/ccs/win_1258.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1258)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1258[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1258[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1258)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1258[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1258[] =
* win_1258 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1258 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ces/cesbi.c b/newlib/libc/iconv/ces/cesbi.c
index c2e6520..5fa5d1b 100644
--- a/newlib/libc/iconv/ces/cesbi.c
+++ b/newlib/libc/iconv/ces/cesbi.c
@@ -12,7 +12,7 @@
*/
#if defined (ICONV_TO_UCS_CES_EUC) \
|| defined (ICONV_FROM_UCS_CES_EUC)
-static _CONST char *
+static const char *
iconv_ces_names_euc[] =
{
# if defined (_ICONV_FROM_ENCODING_EUC_JP) \
@@ -33,7 +33,7 @@ iconv_ces_names_euc[] =
#if defined (ICONV_TO_UCS_CES_TABLE) \
|| defined (ICONV_FROM_UCS_CES_TABLE)
-static _CONST char *
+static const char *
iconv_ces_names_table[] =
{
# if defined (_ICONV_FROM_ENCODING_CP775) \
@@ -174,7 +174,7 @@ iconv_ces_names_table[] =
#if defined (ICONV_TO_UCS_CES_TABLE_PCS) \
|| defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-static _CONST char *
+static const char *
iconv_ces_names_table_pcs[] =
{
# if defined (_ICONV_FROM_ENCODING_BIG5) \
@@ -187,7 +187,7 @@ iconv_ces_names_table_pcs[] =
#if defined (ICONV_TO_UCS_CES_UCS_2) \
|| defined (ICONV_FROM_UCS_CES_UCS_2)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_2[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_2) \
@@ -208,7 +208,7 @@ iconv_ces_names_ucs_2[] =
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) \
|| defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_2_internal[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL) \
@@ -221,7 +221,7 @@ iconv_ces_names_ucs_2_internal[] =
#if defined (ICONV_TO_UCS_CES_UCS_4) \
|| defined (ICONV_FROM_UCS_CES_UCS_4)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_4[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_4) \
@@ -242,7 +242,7 @@ iconv_ces_names_ucs_4[] =
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) \
|| defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_4_internal[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL) \
@@ -255,7 +255,7 @@ iconv_ces_names_ucs_4_internal[] =
#if defined (ICONV_TO_UCS_CES_US_ASCII) \
|| defined (ICONV_FROM_UCS_CES_US_ASCII)
-static _CONST char *
+static const char *
iconv_ces_names_us_ascii[] =
{
# if defined (_ICONV_FROM_ENCODING_US_ASCII) \
@@ -268,7 +268,7 @@ iconv_ces_names_us_ascii[] =
#if defined (ICONV_TO_UCS_CES_UTF_16) \
|| defined (ICONV_FROM_UCS_CES_UTF_16)
-static _CONST char *
+static const char *
iconv_ces_names_utf_16[] =
{
# if defined (_ICONV_FROM_ENCODING_UTF_16) \
@@ -289,7 +289,7 @@ iconv_ces_names_utf_16[] =
#if defined (ICONV_TO_UCS_CES_UTF_8) \
|| defined (ICONV_FROM_UCS_CES_UTF_8)
-static _CONST char *
+static const char *
iconv_ces_names_utf_8[] =
{
# if defined (_ICONV_FROM_ENCODING_UTF_8) \
@@ -303,99 +303,99 @@ iconv_ces_names_utf_8[] =
/*
* The following structure contains the list of "to UCS" linked-in CES converters.
*/
-_CONST iconv_to_ucs_ces_t
+const iconv_to_ucs_ces_t
_iconv_to_ucs_ces[] =
{
#ifdef ICONV_TO_UCS_CES_EUC
- {(_CONST char **)iconv_ces_names_euc,
+ {(const char **)iconv_ces_names_euc,
&_iconv_to_ucs_ces_handlers_euc},
#endif
#ifdef ICONV_TO_UCS_CES_TABLE
- {(_CONST char **)iconv_ces_names_table,
+ {(const char **)iconv_ces_names_table,
&_iconv_to_ucs_ces_handlers_table},
#endif
#ifdef ICONV_TO_UCS_CES_TABLE_PCS
- {(_CONST char **)iconv_ces_names_table_pcs,
+ {(const char **)iconv_ces_names_table_pcs,
&_iconv_to_ucs_ces_handlers_table_pcs},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2
- {(_CONST char **)iconv_ces_names_ucs_2,
+ {(const char **)iconv_ces_names_ucs_2,
&_iconv_to_ucs_ces_handlers_ucs_2},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_2_internal,
+ {(const char **)iconv_ces_names_ucs_2_internal,
&_iconv_to_ucs_ces_handlers_ucs_2_internal},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4
- {(_CONST char **)iconv_ces_names_ucs_4,
+ {(const char **)iconv_ces_names_ucs_4,
&_iconv_to_ucs_ces_handlers_ucs_4},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_4_internal,
+ {(const char **)iconv_ces_names_ucs_4_internal,
&_iconv_to_ucs_ces_handlers_ucs_4_internal},
#endif
#ifdef ICONV_TO_UCS_CES_US_ASCII
- {(_CONST char **)iconv_ces_names_us_ascii,
+ {(const char **)iconv_ces_names_us_ascii,
&_iconv_to_ucs_ces_handlers_us_ascii},
#endif
#ifdef ICONV_TO_UCS_CES_UTF_16
- {(_CONST char **)iconv_ces_names_utf_16,
+ {(const char **)iconv_ces_names_utf_16,
&_iconv_to_ucs_ces_handlers_utf_16},
#endif
#ifdef ICONV_TO_UCS_CES_UTF_8
- {(_CONST char **)iconv_ces_names_utf_8,
+ {(const char **)iconv_ces_names_utf_8,
&_iconv_to_ucs_ces_handlers_utf_8},
#endif
- {(_CONST char **)NULL,
+ {(const char **)NULL,
(iconv_to_ucs_ces_handlers_t *)NULL}
};
/*
* The following structure contains the list of "from UCS" linked-in CES converters.
*/
-_CONST iconv_from_ucs_ces_t
+const iconv_from_ucs_ces_t
_iconv_from_ucs_ces[] =
{
#ifdef ICONV_FROM_UCS_CES_EUC
- {(_CONST char **)iconv_ces_names_euc,
+ {(const char **)iconv_ces_names_euc,
&_iconv_from_ucs_ces_handlers_euc},
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE
- {(_CONST char **)iconv_ces_names_table,
+ {(const char **)iconv_ces_names_table,
&_iconv_from_ucs_ces_handlers_table},
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
- {(_CONST char **)iconv_ces_names_table_pcs,
+ {(const char **)iconv_ces_names_table_pcs,
&_iconv_from_ucs_ces_handlers_table_pcs},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2
- {(_CONST char **)iconv_ces_names_ucs_2,
+ {(const char **)iconv_ces_names_ucs_2,
&_iconv_from_ucs_ces_handlers_ucs_2},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_2_internal,
+ {(const char **)iconv_ces_names_ucs_2_internal,
&_iconv_from_ucs_ces_handlers_ucs_2_internal},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4
- {(_CONST char **)iconv_ces_names_ucs_4,
+ {(const char **)iconv_ces_names_ucs_4,
&_iconv_from_ucs_ces_handlers_ucs_4},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_4_internal,
+ {(const char **)iconv_ces_names_ucs_4_internal,
&_iconv_from_ucs_ces_handlers_ucs_4_internal},
#endif
#ifdef ICONV_FROM_UCS_CES_US_ASCII
- {(_CONST char **)iconv_ces_names_us_ascii,
+ {(const char **)iconv_ces_names_us_ascii,
&_iconv_from_ucs_ces_handlers_us_ascii},
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_16
- {(_CONST char **)iconv_ces_names_utf_16,
+ {(const char **)iconv_ces_names_utf_16,
&_iconv_from_ucs_ces_handlers_utf_16},
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_8
- {(_CONST char **)iconv_ces_names_utf_8,
+ {(const char **)iconv_ces_names_utf_8,
&_iconv_from_ucs_ces_handlers_utf_8},
#endif
- {(_CONST char **)NULL,
+ {(const char **)NULL,
(iconv_from_ucs_ces_handlers_t *)NULL}
};
diff --git a/newlib/libc/iconv/ces/cesbi.h b/newlib/libc/iconv/ces/cesbi.h
index 67e85ef..2b157c2 100644
--- a/newlib/libc/iconv/ces/cesbi.h
+++ b/newlib/libc/iconv/ces/cesbi.h
@@ -183,92 +183,92 @@
* These handlers are actually defined in correspondent CES converter files.
*/
#ifdef ICONV_TO_UCS_CES_EUC
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_euc;
#endif
#ifdef ICONV_FROM_UCS_CES_EUC
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_euc;
#endif
#ifdef ICONV_TO_UCS_CES_TABLE
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table;
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table;
#endif
#ifdef ICONV_TO_UCS_CES_TABLE_PCS
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table_pcs;
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table_pcs;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2_internal;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2_internal;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_4;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_4;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_4_internal;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_4_internal;
#endif
#ifdef ICONV_TO_UCS_CES_US_ASCII
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_us_ascii;
#endif
#ifdef ICONV_FROM_UCS_CES_US_ASCII
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_us_ascii;
#endif
#ifdef ICONV_TO_UCS_CES_UTF_16
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_utf_16;
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_16
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_utf_16;
#endif
#ifdef ICONV_TO_UCS_CES_UTF_8
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_utf_8;
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_8
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_utf_8;
#endif
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 62bab77..ab309a5 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -103,7 +103,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
static _VOID_PTR
_DEFUN(euc_from_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
euc_data_t *data;
@@ -263,7 +263,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(euc_to_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
euc_data_t *data;
@@ -347,7 +347,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
static ucs4_t
_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
int i;
@@ -366,8 +366,8 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
for (i = 1; d->desc[i].csname != NULL; i++)
{
- if (memcmp((_CONST _VOID_PTR)(*inbuf),
- (_CONST _VOID_PTR)d->desc[i].prefix,
+ if (memcmp((const _VOID_PTR)(*inbuf),
+ (const _VOID_PTR)d->desc[i].prefix,
d->desc[i].prefixbytes) == 0)
{
if (((int)*inbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
@@ -388,7 +388,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
d->data[i],
- (_CONST unsigned char **)&inbuf1,
+ (const unsigned char **)&inbuf1,
&inbytesleft1);
if (((__int32_t)res) > 0)
{
@@ -419,7 +419,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
d->data[0],
- (_CONST unsigned char **)&inbuf1,
+ (const unsigned char **)&inbuf1,
&inbytesleft1);
if (((__int32_t)res) > 0)
{
@@ -439,7 +439,7 @@ _DEFUN(euc_get_mb_cur_max, (data),
}
#if defined (ICONV_FROM_UCS_CES_EUC)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_euc =
{
euc_from_ucs_init,
@@ -453,7 +453,7 @@ _iconv_from_ucs_ces_handlers_euc =
#endif
#if defined (ICONV_TO_UCS_CES_EUC)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_euc =
{
euc_to_ucs_init,
diff --git a/newlib/libc/iconv/ces/mkdeps.pl b/newlib/libc/iconv/ces/mkdeps.pl
index 92dd20d..d78dfe8 100755
--- a/newlib/libc/iconv/ces/mkdeps.pl
+++ b/newlib/libc/iconv/ces/mkdeps.pl
@@ -524,12 +524,12 @@ sub generate_cesbi_h($$)
foreach my $ces (@ces)
{
print CESBI_H "#ifdef $macro_to_ucs_ces\U$ces\n";
- print CESBI_H "extern _CONST iconv_to_ucs_ces_handlers_t\n";
+ print CESBI_H "extern const iconv_to_ucs_ces_handlers_t\n";
print CESBI_H "$var_to_ucs_handlers$ces;\n";
print CESBI_H "#endif\n";
print CESBI_H "#ifdef $macro_from_ucs_ces\U$ces\n";
- print CESBI_H "extern _CONST iconv_from_ucs_ces_handlers_t\n";
+ print CESBI_H "extern const iconv_from_ucs_ces_handlers_t\n";
print CESBI_H "$var_from_ucs_handlers$ces;\n";
print CESBI_H "#endif\n\n";
}
@@ -584,7 +584,7 @@ sub generate_aliasesbi_c($)
print ALIASESBI_C "$comment_automatic\n\n";
print ALIASESBI_C "#include <_ansi.h>\n";
print ALIASESBI_C "#include \"encnames.h\"\n\n";
- print ALIASESBI_C "_CONST char *\n";
+ print ALIASESBI_C "const char *\n";
print ALIASESBI_C "$var_aliases =\n";
print ALIASESBI_C "{\n";
@@ -749,7 +749,7 @@ sub generate_ccsbi_h($)
{
print CCSBI_H "#if defined ($macro_to_ucs_ccs\U$ccs) \\\n";
print CCSBI_H " || defined ($macro_from_ucs_ccs\U$ccs)\n";
- print CCSBI_H "extern _CONST iconv_ccs_t\n";
+ print CCSBI_H "extern const iconv_ccs_t\n";
print CCSBI_H "$var_ccs$ccs;\n";
print CCSBI_H "#endif\n";
}
@@ -789,7 +789,7 @@ sub generate_cesbi_c($)
{
print CESBI_C "#if defined ($macro_to_ucs_ces\U$ces) \\\n";
print CESBI_C " || defined ($macro_from_ucs_ces\U$ces)\n";
- print CESBI_C "static _CONST char *\n";
+ print CESBI_C "static const char *\n";
print CESBI_C "$var_ces_names${ces}\[] =\n";
print CESBI_C "{\n";
my @encodings = sort @{$cesenc{$ces}};
@@ -808,36 +808,36 @@ sub generate_cesbi_c($)
print CESBI_C "/*\n";
print CESBI_C " * The following structure contains the list of \"to UCS\" linked-in CES converters.\n";
print CESBI_C " */\n";
- print CESBI_C "_CONST iconv_to_ucs_ces_t\n";
+ print CESBI_C "const iconv_to_ucs_ces_t\n";
print CESBI_C "_iconv_to_ucs_ces[] =\n";
print CESBI_C "{\n";
foreach my $ces (@ces)
{
print CESBI_C "#ifdef $macro_to_ucs_ces\U$ces\n";
- print CESBI_C " {(_CONST char **)$var_ces_names$ces,\n";
+ print CESBI_C " {(const char **)$var_ces_names$ces,\n";
print CESBI_C " &$var_to_ucs_handlers$ces},\n";
print CESBI_C "#endif\n";
}
- print CESBI_C " {(_CONST char **)NULL,\n";
+ print CESBI_C " {(const char **)NULL,\n";
print CESBI_C " (iconv_to_ucs_ces_handlers_t *)NULL}\n";
print CESBI_C "};\n\n";
print CESBI_C "/*\n";
print CESBI_C " * The following structure contains the list of \"from UCS\" linked-in CES converters.\n";
print CESBI_C " */\n";
- print CESBI_C "_CONST iconv_from_ucs_ces_t\n";
+ print CESBI_C "const iconv_from_ucs_ces_t\n";
print CESBI_C "_iconv_from_ucs_ces[] =\n";
print CESBI_C "{\n";
foreach my $ces (@ces)
{
print CESBI_C "#ifdef $macro_from_ucs_ces\U$ces\n";
- print CESBI_C " {(_CONST char **)$var_ces_names$ces,\n";
+ print CESBI_C " {(const char **)$var_ces_names$ces,\n";
print CESBI_C " &$var_from_ucs_handlers$ces},\n";
print CESBI_C "#endif\n";
}
- print CESBI_C " {(_CONST char **)NULL,\n";
+ print CESBI_C " {(const char **)NULL,\n";
print CESBI_C " (iconv_from_ucs_ces_handlers_t *)NULL}\n";
print CESBI_C "};\n";
@@ -866,7 +866,7 @@ sub generate_ccsbi_c($)
print CESBI_C " * The following array contains the list of built-in CCS tables.\n";
print CESBI_C " */\n";
- print CESBI_C "_CONST iconv_ccs_t *\n";
+ print CESBI_C "const iconv_ccs_t *\n";
print CESBI_C "_iconv_ccs[] =\n";
print CESBI_C "{\n";
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 650bf9a..1bab909 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -67,7 +67,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
}
@@ -93,7 +93,7 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
static ucs4_t
_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
if (*inbytesleft < 1)
@@ -115,7 +115,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
static _VOID_PTR
_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
}
@@ -138,7 +138,7 @@ _DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
#endif /* ICONV_TO_UCS_CES_TABLE_PCS */
#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table_pcs =
{
table_pcs_from_ucs_init,
@@ -152,7 +152,7 @@ _iconv_from_ucs_ces_handlers_table_pcs =
#endif
#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table_pcs =
{
table_pcs_to_ucs_init,
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 39c358c..c02831a 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -57,17 +57,17 @@
*/
static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, _CONST __uint16_t *tblp));
+_EXFUN(find_code_size, (ucs2_t code, const __uint16_t *tblp));
static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, _CONST __uint16_t *tblp));
+_EXFUN(find_code_speed, (ucs2_t code, const __uint16_t *tblp));
static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, _CONST unsigned char *tblp));
+_EXFUN(find_code_speed_8bit, (ucs2_t code, const unsigned char *tblp));
#ifdef _ICONV_ENABLE_EXTERNAL_CCS
-static _CONST iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
+static const iconv_ccs_desc_t *
+_EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
#endif
/*
@@ -78,7 +78,7 @@ _DEFUN(table_close, (rptr, data),
struct _reent *rptr,
_VOID_PTR data)
{
- _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+ const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
if (ccsp->type == TABLE_EXTERNAL)
_free_r (rptr, (_VOID_PTR)ccsp->tbl);
@@ -91,10 +91,10 @@ _DEFUN(table_close, (rptr, data),
static _VOID_PTR
_DEFUN(table_init_from_ucs, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
- _CONST iconv_ccs_t *biccsp = NULL;
+ const iconv_ccs_t *biccsp = NULL;
iconv_ccs_desc_t *ccsp;
for (i = 0; _iconv_ccs[i] != NULL; i++)
@@ -133,7 +133,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
unsigned char **outbuf,
size_t *outbytesleft)
{
- _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+ const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
ucs2_t code;
if (in > 0xFFFF || in == INVALC)
@@ -142,7 +142,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
if (ccsp->bits == TABLE_8BIT)
{
code = find_code_speed_8bit ((ucs2_t)in,
- (_CONST unsigned char *)ccsp->tbl);
+ (const unsigned char *)ccsp->tbl);
if (code == INVALC)
return (size_t)ICONV_CES_INVALID_CHARACTER;
**outbuf = (unsigned char)code;
@@ -174,10 +174,10 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(table_init_to_ucs, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
- _CONST iconv_ccs_t *biccsp = NULL;
+ const iconv_ccs_t *biccsp = NULL;
iconv_ccs_desc_t *ccsp;
for (i = 0; _iconv_ccs[i] != NULL; i++)
@@ -212,10 +212,10 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
static ucs4_t
_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
- _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+ const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
ucs2_t ucs;
if (ccsp->bits == TABLE_8BIT)
@@ -261,7 +261,7 @@ _DEFUN(table_get_mb_cur_max, (data),
#if defined (ICONV_TO_UCS_CES_TABLE)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table =
{
table_init_to_ucs,
@@ -275,7 +275,7 @@ _iconv_to_ucs_ces_handlers_table =
#endif /* ICONV_FROM_UCS_CES_TABLE */
#if defined (ICONV_FROM_UCS_CES_TABLE)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table =
{
table_init_from_ucs,
@@ -297,7 +297,7 @@ _iconv_from_ucs_ces_handlers_table =
*
* PARAMETERS:
* ucs2_t code - code whose mapping to find.
- * _CONST __uint16_t *tblp - table pointer.
+ * const __uint16_t *tblp - table pointer.
*
* RETURN:
* Code that corresponds to 'code'.
@@ -305,7 +305,7 @@ _iconv_from_ucs_ces_handlers_table =
static __inline ucs2_t
_DEFUN(find_code_speed, (code, tblp),
ucs2_t code,
- _CONST __uint16_t *tblp)
+ const __uint16_t *tblp)
{
int idx = tblp[code >> 8];
@@ -320,7 +320,7 @@ _DEFUN(find_code_speed, (code, tblp),
*
* PARAMETERS:
* ucs2_t code - code whose mapping to find.
- * _CONST __uint16_t *tblp - table pointer.
+ * const __uint16_t *tblp - table pointer.
*
* RETURN:
* Code that corresponds to 'code'.
@@ -328,7 +328,7 @@ _DEFUN(find_code_speed, (code, tblp),
static __inline ucs2_t
_DEFUN(find_code_speed_8bit, (code, tblp),
ucs2_t code,
- _CONST unsigned char *tblp)
+ const unsigned char *tblp)
{
int idx;
unsigned char ccs;
@@ -360,7 +360,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
*
* PARAMETERS:
* ucs2_t code - code whose mapping to find.
- * _CONST __uint16_t *tblp - table pointer.
+ * const __uint16_t *tblp - table pointer.
*
* RETURN:
* Code that corresponds to 'code'.
@@ -368,7 +368,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
static ucs2_t
_DEFUN(find_code_size, (code, tblp),
ucs2_t code,
- _CONST __uint16_t *tblp)
+ const __uint16_t *tblp)
{
int first, last, cur, center;
@@ -447,7 +447,7 @@ _DEFUN(find_code_size, (code, tblp),
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _CONST char *name - encoding name.
+ * const char *name - encoding name.
* int direction - conversion direction.
*
* DESCRIPTION:
@@ -459,17 +459,17 @@ _DEFUN(find_code_size, (code, tblp),
* RETURN:
* iconv_ccs_desc_t * pointer is success, NULL if failure.
*/
-static _CONST iconv_ccs_desc_t *
+static const iconv_ccs_desc_t *
_DEFUN(load_file, (rptr, name, direction),
struct _reent *rptr,
- _CONST char *name,
+ const char *name,
int direction)
{
int fd;
- _CONST unsigned char *buf;
+ const unsigned char *buf;
int tbllen, hdrlen;
off_t off;
- _CONST char *fname;
+ const char *fname;
iconv_ccs_desc_t *ccsp = NULL;
int nmlen = strlen(name);
/* Since CCS table name length can vary - it is aligned (by adding extra
@@ -487,7 +487,7 @@ _DEFUN(load_file, (rptr, name, direction),
if ((fd = _open_r (rptr, fname, O_RDONLY, S_IRUSR)) == -1)
goto error1;
- if ((buf = (_CONST unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
+ if ((buf = (const unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
goto error2;
if (_read_r (rptr, fd, (_VOID_PTR)buf, hdrlen) != hdrlen)
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 2aacce9..7aed01e 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -68,7 +68,7 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs4_t res;
@@ -96,7 +96,7 @@ _DEFUN(ucs_2_internal_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2_internal =
{
NULL,
@@ -110,7 +110,7 @@ _iconv_to_ucs_ces_handlers_ucs_2_internal =
#endif
#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2_internal =
{
NULL,
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 000a791..7d03ee8 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -52,7 +52,7 @@
static _VOID_PTR
_DEFUN(ucs_2_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int *data;
@@ -107,7 +107,7 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- [...]
[diff truncated at 100000 bytes]
More information about the Newlib-cvs
mailing list