[PATCH v2] ctype: use less short names in public header

Corinna Vinschen vinschen@redhat.com
Fri Nov 12 10:27:52 GMT 2021


On Nov 11 17:28, Mike Frysinger wrote:
> On 11 Nov 2021 11:35, Corinna Vinschen wrote:
> > On Nov 10 20:37, Mike Frysinger wrote:
> > > 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.
> > > ---
> > >  newlib/libc/ctype/ctype_.h     | 10 +++++
> > >  newlib/libc/ctype/isalnum.c    |  2 +-
> > >  newlib/libc/ctype/isalnum_l.c  |  2 +-
> > >  newlib/libc/ctype/isalpha.c    |  2 +-
> > >  newlib/libc/ctype/isalpha_l.c  |  2 +-
> > >  newlib/libc/ctype/isblank.c    |  2 +-
> > >  newlib/libc/ctype/isblank_l.c  |  2 +-
> > >  newlib/libc/ctype/iscntrl.c    |  2 +-
> > >  newlib/libc/ctype/iscntrl_l.c  |  2 +-
> > >  newlib/libc/ctype/isdigit.c    |  2 +-
> > >  newlib/libc/ctype/isdigit_l.c  |  2 +-
> > >  newlib/libc/ctype/islower.c    |  2 +-
> > >  newlib/libc/ctype/islower_l.c  |  2 +-
> > >  newlib/libc/ctype/isprint.c    |  4 +-
> > >  newlib/libc/ctype/isprint_l.c  |  4 +-
> > >  newlib/libc/ctype/ispunct.c    |  2 +-
> > >  newlib/libc/ctype/ispunct_l.c  |  2 +-
> > >  newlib/libc/ctype/isspace.c    |  2 +-
> > >  newlib/libc/ctype/isspace_l.c  |  2 +-
> > >  newlib/libc/ctype/isupper.c    |  2 +-
> > >  newlib/libc/ctype/isupper_l.c  |  2 +-
> > >  newlib/libc/ctype/isxdigit.c   |  2 +-
> > >  newlib/libc/ctype/isxdigit_l.c |  2 +-
> > >  newlib/libc/include/ctype.h    | 67 ++++++++++++++++++----------------
> > >  24 files changed, 69 insertions(+), 56 deletions(-)
> > 
> > Good idea to move the _X macros to ctype_.h :)  Please push.
> 
> i pushed this since it's standalone now.  not sure if you're also saying
> "define _COMPILING_NEWLIB for all targets when compiling" is OK, so i haven't
> pushed that yet.

Oh, that was implicitly clear to me, given the original dependency.
So, yeah, please push.


Thanks,
Corinna




More information about the Newlib mailing list