From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127254 invoked by alias); 6 Sep 2018 12:22:00 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 127227 invoked by uid 9078); 6 Sep 2018 12:21:59 -0000 Date: Thu, 06 Sep 2018 12:22:00 -0000 Message-ID: <20180906122159.127225.qmail@sourceware.org> 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] Use !__HAVE_LOCALE_INFO__ define to use _ctype_ directly [v2] X-Act-Checkin: newlib-cygwin X-Git-Author: Keith Packard X-Git-Refname: refs/heads/master X-Git-Oldrev: 3b6994ec5f5fb47ba87fb3dae154cad21017b30d X-Git-Newrev: 77f8a6dfab98d8afd662c34ea832579f0565b40c X-SW-Source: 2018-q3/txt/msg00119.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=77f8a6dfab98d8afd662c34ea832579f0565b40c commit 77f8a6dfab98d8afd662c34ea832579f0565b40c Author: Keith Packard Date: Wed Sep 5 21:39:40 2018 -0700 Use !__HAVE_LOCALE_INFO__ define to use _ctype_ directly [v2] When __HAVE_LOCALE_INFO__ is not selected, directly access the existing _ctype_ variable from __locale_ctype_ptr() and __locale_ctype_ptr_l(), eliminating the need for any locale or reent structure Signed-off-by: Keith Packard v2: locale: fix conflict with __locale_ctype_ptr macro If we are building without __HAVE_LOCALE_INFO__, there is a macro providing __locale_ctype_ptr which in turn fouls up this declaration. Signed-off-by: Michael Lyle Diff: --- newlib/libc/include/ctype.h | 9 +++++++++ newlib/libc/locale/locale.c | 2 ++ newlib/libc/locale/setlocale.h | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h index f74b349..1cee695 100644 --- a/newlib/libc/include/ctype.h +++ b/newlib/libc/include/ctype.h @@ -66,7 +66,12 @@ extern int toascii_l (int __c, locale_t __l); #define _X 0100 #define _B 0200 +#ifdef __HAVE_LOCALE_INFO__ const char *__locale_ctype_ptr (void); +#else +#define __locale_ctype_ptr() _ctype_ +#endif + # define __CTYPE_PTR (__locale_ctype_ptr ()) #ifndef __cplusplus @@ -100,7 +105,11 @@ const char *__locale_ctype_ptr (void); #endif #if __POSIX_VISIBLE >= 200809 +#ifdef __HAVE_LOCALE_INFO__ const char *__locale_ctype_ptr_l (locale_t); +#else +#define __locale_ctype_ptr_l(l) _ctype_ +#endif #define __ctype_lookup_l(__c,__l) ((__locale_ctype_ptr_l(__l)+sizeof(""[__c]))[(int)(__c)]) #define isalpha_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_U|_L)) diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c index 557982d..791a775 100644 --- a/newlib/libc/locale/locale.c +++ b/newlib/libc/locale/locale.c @@ -981,6 +981,7 @@ __locale_mb_cur_max (void) #endif } +#ifdef __HAVE_LOCALE_INFO__ const char * __locale_ctype_ptr_l (struct __locale_t *locale) { @@ -992,6 +993,7 @@ __locale_ctype_ptr (void) { return __get_current_locale ()->ctype_ptr; } +#endif /* __HAVE_LOCALE_INFO__ */ #ifndef _REENT_ONLY diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h index 85a38d5..25c27cf 100644 --- a/newlib/libc/locale/setlocale.h +++ b/newlib/libc/locale/setlocale.h @@ -217,7 +217,11 @@ __get_global_locale () _ELIDABLE_INLINE struct __locale_t * __get_locale_r (struct _reent *r) { +#ifdef __HAVE_LOCALE_INFO__ return r->_locale; +#else + return __get_global_locale(); +#endif } /* In POSIX terms the current locale is the locale used by all functions @@ -227,7 +231,11 @@ __get_locale_r (struct _reent *r) _ELIDABLE_INLINE struct __locale_t * __get_current_locale (void) { +#ifdef __HAVE_LOCALE_INFO__ return _REENT->_locale ?: __get_global_locale (); +#else + return __get_global_locale(); +#endif } /* Only access fixed "C" locale using this function. Fake for !_MB_CAPABLE