libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-21 00:07:36 +08:00
Code Issues Projects Releases Wiki Activity

ctype: use less short names in public header

Browse Source 
We're seeing a build failure in GNU sim code which is using _P locally
but the ctype.h define clashes with it.  Rename these to use the same
symbols that glibc does.  They're a bit more verbose, but seems likely
that we'll have fewer conflicts if glibc isn't seeing them.

However, these shortnames are still used internally by ctype modules
to produce pretty concise source code, so move the short names to the
internal ctype_.h where short name conflicts shouldn't show up.
This commit is contained in:
Mike Frysinger 2021-11-08 19:28:16 -05:00
parent 88c9008bb2
commit 3ba1bd0d9d
24 changed files with 69 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newlib/libc/ctype/ctype_.h
View File

@ -1,5 +1,15 @@
#include <ctype.h> #include <ctype.h>
/* Define some short names to keep internal files shorter. */
#define _U _ISupper
#define _L _ISlower
#define _N _ISdigit
#define _S _ISspace
#define _P _ISpunct
#define _C _IScntrl
#define _X _ISxdigit
#define _B _ISblank
#if (defined(__GNUC__) && !defined(__CHAR_UNSIGNED__) && !defined(COMPACT_CTYPE)) || defined (__CYGWIN__) #if (defined(__GNUC__) && !defined(__CHAR_UNSIGNED__) && !defined(COMPACT_CTYPE)) || defined (__CYGWIN__)
#define ALLOW_NEGATIVE_CTYPE_INDEX #define ALLOW_NEGATIVE_CTYPE_INDEX
#endif #endif

2
newlib/libc/ctype/isalnum.c
View File

@ -46,5 +46,5 @@ No OS subroutines are required.
int int
isalnum (int c) isalnum (int c)
{ {
return(__CTYPE_PTR[c+1] & (_U|_L|_N)); return(__CTYPE_PTR[c+1] & (_ISupper|_ISlower|_ISdigit));
} }

2
newlib/libc/ctype/isalnum_l.c
View File

@ -6,5 +6,5 @@
int int
isalnum_l (int c, struct __locale_t *locale) isalnum_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & (_U|_L|_N); return __locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower|_ISdigit);
} }

2
newlib/libc/ctype/isalpha.c
View File

@ -45,5 +45,5 @@ No supporting OS subroutines are required.
int int
isalpha (int c) isalpha (int c)
{ {
return(__CTYPE_PTR[c+1] & (_U|_L)); return(__CTYPE_PTR[c+1] & (_ISupper|_ISlower));
} }

2
newlib/libc/ctype/isalpha_l.c
View File

@ -6,5 +6,5 @@
int int
isalpha_l (int c, struct __locale_t *locale) isalpha_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & (_U|_L); return __locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower);
} }

2
newlib/libc/ctype/isblank.c
View File

@ -44,5 +44,5 @@ No supporting OS subroutines are required.
int int
isblank (int c) isblank (int c)
{ {
return ((__CTYPE_PTR[c+1] & _B) || (c == '\t')); return ((__CTYPE_PTR[c+1] & _ISblank) || (c == '\t'));
} }

2
newlib/libc/ctype/isblank_l.c
View File

@ -6,5 +6,5 @@
int int
isblank_l (int c, struct __locale_t *locale) isblank_l (int c, struct __locale_t *locale)
{ {
return (__locale_ctype_ptr_l (locale)[c+1] & _B) || (c == '\t'); return (__locale_ctype_ptr_l (locale)[c+1] & _ISblank) || (c == '\t');
} }

2
newlib/libc/ctype/iscntrl.c
View File

@ -48,5 +48,5 @@ No supporting OS subroutines are required.
int int
iscntrl (int c) iscntrl (int c)
{ {
return(__CTYPE_PTR[c+1] & _C); return(__CTYPE_PTR[c+1] & _IScntrl);
} }

2
newlib/libc/ctype/iscntrl_l.c
View File

@ -6,5 +6,5 @@
int int
iscntrl_l (int c, struct __locale_t *locale) iscntrl_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & _C; return __locale_ctype_ptr_l (locale)[c+1] & _IScntrl;
} }

2
newlib/libc/ctype/isdigit.c
View File

@ -47,5 +47,5 @@ No supporting OS subroutines are required.
int int
isdigit (int c) isdigit (int c)
{ {
return(__CTYPE_PTR[c+1] & _N); return(__CTYPE_PTR[c+1] & _ISdigit);
} }

2
newlib/libc/ctype/isdigit_l.c
View File

@ -6,5 +6,5 @@
int int
isdigit_l (int c, struct __locale_t *locale) isdigit_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & _N; return __locale_ctype_ptr_l (locale)[c+1] & _ISdigit;
} }

2
newlib/libc/ctype/islower.c
View File

@ -45,5 +45,5 @@ No supporting OS subroutines are required.
int int
islower (int c) islower (int c)
{ {
return ((__CTYPE_PTR[c+1] & (_U|_L)) == _L); return ((__CTYPE_PTR[c+1] & (_ISupper|_ISlower)) == _ISlower);
} }

2
newlib/libc/ctype/islower_l.c
View File

@ -6,5 +6,5 @@
int int
islower_l (int c, struct __locale_t *locale) islower_l (int c, struct __locale_t *locale)
{ {
return (__locale_ctype_ptr_l (locale)[c+1] & (_U|_L)) == _L; return (__locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower)) == _ISlower;
} }

4
newlib/libc/ctype/isprint.c
View File

@ -59,7 +59,7 @@ No supporting OS subroutines are required.
int int
isgraph (int c) isgraph (int c)
{ {
return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N)); return(__CTYPE_PTR[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit));
} }
@ -67,5 +67,5 @@ isgraph (int c)
int int
isprint (int c) isprint (int c)
{ {
return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N|_B)); return(__CTYPE_PTR[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank));
} }

4
newlib/libc/ctype/isprint_l.c
View File

@ -6,7 +6,7 @@
int int
isgraph_l (int c, struct __locale_t *locale) isgraph_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & (_P|_U|_L|_N); return __locale_ctype_ptr_l (locale)[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit);
} }
#undef isprint_l #undef isprint_l
@ -14,5 +14,5 @@ isgraph_l (int c, struct __locale_t *locale)
int int
isprint_l (int c, struct __locale_t *locale) isprint_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & (_P|_U|_L|_N|_B); return __locale_ctype_ptr_l (locale)[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank);
} }

2
newlib/libc/ctype/ispunct.c
View File

@ -47,5 +47,5 @@ No supporting OS subroutines are required.
int int
ispunct (int c) ispunct (int c)
{ {
return(__CTYPE_PTR[c+1] & _P); return(__CTYPE_PTR[c+1] & _ISpunct);
} }

2
newlib/libc/ctype/ispunct_l.c
View File

@ -6,6 +6,6 @@
int int
ispunct_l (int c, struct __locale_t *locale) ispunct_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & _P; return __locale_ctype_ptr_l (locale)[c+1] & _ISpunct;
} }

2
newlib/libc/ctype/isspace.c
View File

@ -46,5 +46,5 @@ No supporting OS subroutines are required.
int int
isspace (int c) isspace (int c)
{ {
return(__CTYPE_PTR[c+1] & _S); return(__CTYPE_PTR[c+1] & _ISspace);
} }

2
newlib/libc/ctype/isspace_l.c
View File

@ -6,6 +6,6 @@
int int
isspace_l (int c, struct __locale_t *locale) isspace_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & _S; return __locale_ctype_ptr_l (locale)[c+1] & _ISspace;
} }

2
newlib/libc/ctype/isupper.c
View File

@ -43,5 +43,5 @@ No supporting OS subroutines are required.
int int
isupper (int c) isupper (int c)
{ {
return ((__CTYPE_PTR[c+1] & (_U|_L)) == _U); return ((__CTYPE_PTR[c+1] & (_ISupper|_ISlower)) == _ISupper);
} }

2
newlib/libc/ctype/isupper_l.c
View File

@ -6,6 +6,6 @@
int int
isupper_l (int c, struct __locale_t *locale) isupper_l (int c, struct __locale_t *locale)
{ {
return (__locale_ctype_ptr_l (locale)[c+1] & (_U|_L)) == _U; return (__locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower)) == _ISupper;
} }

2
newlib/libc/ctype/isxdigit.c
View File

@ -46,5 +46,5 @@ No supporting OS subroutines are required.
int int
isxdigit (int c) isxdigit (int c)
{ {
return(__CTYPE_PTR[c+1] & ((_X)|(_N))); return(__CTYPE_PTR[c+1] & ((_ISxdigit)|(_ISdigit)));
} }

2
newlib/libc/ctype/isxdigit_l.c
View File

@ -6,6 +6,6 @@
int int
isxdigit_l (int c, struct __locale_t *locale) isxdigit_l (int c, struct __locale_t *locale)
{ {
return __locale_ctype_ptr_l (locale)[c+1] & ((_X)|(_N)); return __locale_ctype_ptr_l (locale)[c+1] & ((_ISxdigit)|(_ISdigit));
} }

67
newlib/libc/include/ctype.h
View File

@ -57,14 +57,17 @@ extern int isascii_l (int __c, locale_t __l);
extern int toascii_l (int __c, locale_t __l); extern int toascii_l (int __c, locale_t __l);
#endif #endif
#define _U 01 enum
#define _L 02 {
#define _N 04 _ISupper = 01,
#define _S 010 _ISlower = 02,
#define _P 020 _ISdigit = 04,
#define _C 040 _ISspace = 010,
#define _X 0100 _ISpunct = 020,
#define _B 0200 _IScntrl = 040,
_ISxdigit = 0100,
_ISblank = 0200,
};
/* For C++ backward-compatibility only. */ /* For C++ backward-compatibility only. */
extern __IMPORT const char _ctype_[]; extern __IMPORT const char _ctype_[];
@ -89,22 +92,22 @@ const char *__locale_ctype_ptr (void);
an out-of-bounds reference on a 64-bit machine. */ an out-of-bounds reference on a 64-bit machine. */
#define __ctype_lookup(__c) ((__CTYPE_PTR+sizeof(""[__c]))[(int)(__c)]) #define __ctype_lookup(__c) ((__CTYPE_PTR+sizeof(""[__c]))[(int)(__c)])
#define isalpha(__c) (__ctype_lookup(__c)&(_U|_L)) #define isalpha(__c) (__ctype_lookup(__c) & (_ISupper|_ISlower))
#define isupper(__c) ((__ctype_lookup(__c)&(_U|_L))==_U) #define isupper(__c) ((__ctype_lookup(__c) & (_ISupper|_ISlower)) == _ISupper)
#define islower(__c) ((__ctype_lookup(__c)&(_U|_L))==_L) #define islower(__c) ((__ctype_lookup(__c) & (_ISupper|_ISlower)) == _ISlower)
#define isdigit(__c) (__ctype_lookup(__c)&_N) #define isdigit(__c) (__ctype_lookup(__c) & _ISdigit)
#define isxdigit(__c) (__ctype_lookup(__c)&(_X|_N)) #define isxdigit(__c) (__ctype_lookup(__c) & (_ISxdigit|_ISdigit))
#define isspace(__c) (__ctype_lookup(__c)&_S) #define isspace(__c) (__ctype_lookup(__c) & _ISspace)
#define ispunct(__c) (__ctype_lookup(__c)&_P) #define ispunct(__c) (__ctype_lookup(__c) & _ISpunct)
#define isalnum(__c) (__ctype_lookup(__c)&(_U|_L|_N)) #define isalnum(__c) (__ctype_lookup(__c) & (_ISupper|_ISlower|_ISdigit))
#define isprint(__c) (__ctype_lookup(__c)&(_P|_U|_L|_N|_B)) #define isprint(__c) (__ctype_lookup(__c) & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank))
#define isgraph(__c) (__ctype_lookup(__c)&(_P|_U|_L|_N)) #define isgraph(__c) (__ctype_lookup(__c) & (_ISpunct|_ISupper|_ISlower|_ISdigit))
#define iscntrl(__c) (__ctype_lookup(__c)&_C) #define iscntrl(__c) (__ctype_lookup(__c) & _IScntrl)
#if defined(__GNUC__) && __ISO_C_VISIBLE >= 1999 #if defined(__GNUC__) && __ISO_C_VISIBLE >= 1999
#define isblank(__c) \ #define isblank(__c) \
__extension__ ({ __typeof__ (__c) __x = (__c); \ __extension__ ({ __typeof__ (__c) __x = (__c); \
(__ctype_lookup(__x)&_B) || (int) (__x) == '\t';}) (__ctype_lookup(__x)&_ISblank) || (int) (__x) == '\t';})
#endif #endif
#if __POSIX_VISIBLE >= 200809 #if __POSIX_VISIBLE >= 200809
@ -120,22 +123,22 @@ __locale_ctype_ptr_l(locale_t _l)
#endif #endif
#define __ctype_lookup_l(__c,__l) ((__locale_ctype_ptr_l(__l)+sizeof(""[__c]))[(int)(__c)]) #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)) #define isalpha_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower))
#define isupper_l(__c,__l) ((__ctype_lookup_l(__c,__l)&(_U|_L))==_U) #define isupper_l(__c,__l) ((__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower)) == _ISupper)
#define islower_l(__c,__l) ((__ctype_lookup_l(__c,__l)&(_U|_L))==_L) #define islower_l(__c,__l) ((__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower)) == _ISlower)
#define isdigit_l(__c,__l) (__ctype_lookup_l(__c,__l)&_N) #define isdigit_l(__c,__l) (__ctype_lookup_l(__c,__l) & _ISdigit)
#define isxdigit_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_X|_N)) #define isxdigit_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISxdigit|_ISdigit))
#define isspace_l(__c,__l) (__ctype_lookup_l(__c,__l)&_S) #define isspace_l(__c,__l) (__ctype_lookup_l(__c,__l) & _ISspace)
#define ispunct_l(__c,__l) (__ctype_lookup_l(__c,__l)&_P) #define ispunct_l(__c,__l) (__ctype_lookup_l(__c,__l) & _ISpunct)
#define isalnum_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_U|_L|_N)) #define isalnum_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower|_ISdigit))
#define isprint_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_P|_U|_L|_N|_B)) #define isprint_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank))
#define isgraph_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_P|_U|_L|_N)) #define isgraph_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISpunct|_ISupper|_ISlower|_ISdigit))
#define iscntrl_l(__c,__l) (__ctype_lookup_l(__c,__l)&_C) #define iscntrl_l(__c,__l) (__ctype_lookup_l(__c,__l) & _IScntrl)
#if defined(__GNUC__) #if defined(__GNUC__)
#define isblank_l(__c, __l) \ #define isblank_l(__c, __l) \
__extension__ ({ __typeof__ (__c) __x = (__c); \ __extension__ ({ __typeof__ (__c) __x = (__c); \
(__ctype_lookup_l(__x,__l)&_B) || (int) (__x) == '\t';}) (__ctype_lookup_l(__x,__l)&_ISblank) || (int) (__x) == '\t';})
#endif #endif
#endif /* __POSIX_VISIBLE >= 200809 */ #endif /* __POSIX_VISIBLE >= 200809 */