From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id DBABE385703A; Fri, 10 Jul 2020 10:03:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBABE385703A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libc/iconv: Remove unneeded pointer var for _iconv_aliases X-Act-Checkin: newlib-cygwin X-Git-Author: Keith Packard via Newlib X-Git-Refname: refs/heads/master X-Git-Oldrev: 6c772f4547c5eea46fb814806509b78f08dfdfa1 X-Git-Newrev: 2c33d31fa81d97addab774a2b460a3779990c132 Message-Id: <20200710100320.DBABE385703A@sourceware.org> Date: Fri, 10 Jul 2020 10:03:20 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2020 10:03:21 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2c33d31fa81d97addab774a2b460a3779990c132 commit 2c33d31fa81d97addab774a2b460a3779990c132 Author: Keith Packard via Newlib Date: Thu Jul 9 16:58:46 2020 -0700 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 Diff: --- newlib/libc/iconv/lib/aliasesbi.c | 5 ++--- newlib/libc/iconv/lib/local.h | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/newlib/libc/iconv/lib/aliasesbi.c b/newlib/libc/iconv/lib/aliasesbi.c index dfd7090d0..83b6fd003 100644 --- a/newlib/libc/iconv/lib/aliasesbi.c +++ b/newlib/libc/iconv/lib/aliasesbi.c @@ -5,8 +5,8 @@ #include <_ansi.h> #include "encnames.h" -const char * -_iconv_aliases = +const char +_iconv_aliases[] = { #if defined (_ICONV_FROM_ENCODING_BIG5) \ || defined (_ICONV_TO_ENCODING_BIG5) @@ -210,4 +210,3 @@ _iconv_aliases = #endif "" }; - diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h index bd9dcddca..2d3a16969 100644 --- a/newlib/libc/iconv/lib/local.h +++ b/newlib/libc/iconv/lib/local.h @@ -57,10 +57,8 @@ typedef __uint16_t ucs2_t; /* 32-bit UCS-4 type */ typedef __uint32_t ucs4_t; - /* The list of built-in encoding names and aliases */ -extern const char * -_iconv_aliases; +extern const char _iconv_aliases[]; #endif /* !__ICONV_LIB_LOCAL_H__ */