mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
2072f5c34e
glibc headers include some code (not particularly consistent or systematic) to put various declarations in C++ namespaces std and __c99, if _GLIBCPP_USE_NAMESPACES is defined. As noted in <https://gcc.gnu.org/ml/libstdc++/2017-03/msg00025.html>, this macro was removed from libstdc++ in 2000. I don't expect compilation with such old versions of libstdc++ to work with current glibc headers anyway (whereas old *binaries* are expected to stay working with current glibc); this patch (which should be a no-op with any libstdc++ version postdating that removal) removes all this code from the glibc headers. The begin-end-check.pl test, whose comments say it is about checking these namespace macro calls, is also removed. The code in that test would have covered __BEGIN_DECLS / __END_DECLS as well, but if those weren't properly matched it would show up with the check-installed-headers-cxx tests, so I don't think there is an actual use for keeping begin-end-check.pl with the namespace code removed. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * misc/sys/cdefs.h (__BEGIN_NAMESPACE_STD): Remove macro. (__END_NAMESPACE_STD): Likewise. (__USING_NAMESPACE_STD): Likewise. (__BEGIN_NAMESPACE_C99): Likewise. (__END_NAMESPACE_C99): Likewise. (__USING_NAMESPACE_C99): Likewise. * math/math.h (_Mdouble_BEGIN_NAMESPACE): Do not define and undefine macro. (_Mdouble_END_NAMESPACE): Likewise. * ctype/ctype.h: Do not handle C++ namespaces. * libio/bits/stdio-ldbl.h: Likewise. * libio/stdio.h: Likewise. * locale/locale.h: Likewise. * math/bits/mathcalls.h: Likewise. * setjmp/setjmp.h: Likewise. * signal/signal.h: Likewise. * stdlib/bits/stdlib-float.h: Likewise. * stdlib/bits/stdlib-ldbl.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * sysdeps/x86/fpu/bits/mathinline.h: Likewise. * time/bits/types/clock_t.h: Likewise. * time/bits/types/struct_tm.h: Likewise. * time/bits/types/time_t.h: Likewise. * time/time.h: Likewise. * wcsmbs/bits/wchar-ldbl.h: Likewise. * wcsmbs/uchar.h: Likewise. * wcsmbs/wchar.h: Likewise. [_GLIBCPP_USE_NAMESPACES] (wint_t): Remove conditional definition. * wctype/wctype.h: Do not handle C++ namespaces. * scripts/begin-end-check.pl: Remove. * Makefile (installed-headers): Likewise. (tests-special): Do not add $(objpfx)begin-end-check.out. ($(objpfx)begin-end-check.out): Remove.
306 lines
11 KiB
C
306 lines
11 KiB
C
/* Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/*
|
|
* ISO C99 Standard: 7.25
|
|
* Wide character classification and mapping utilities <wctype.h>
|
|
*/
|
|
|
|
#ifndef _WCTYPE_H
|
|
|
|
#include <features.h>
|
|
#include <bits/types.h>
|
|
|
|
#ifndef __need_iswxxx
|
|
# define _WCTYPE_H 1
|
|
|
|
/* Get wint_t from <wchar.h>. */
|
|
# define __need_wint_t
|
|
# include <wchar.h>
|
|
|
|
/* Constant expression of type `wint_t' whose value does not correspond
|
|
to any member of the extended character set. */
|
|
# ifndef WEOF
|
|
# define WEOF (0xffffffffu)
|
|
# endif
|
|
#endif
|
|
#undef __need_iswxxx
|
|
|
|
|
|
/* The following part is also used in the <wcsmbs.h> header when compiled
|
|
in the Unix98 compatibility mode. */
|
|
#ifndef __iswxxx_defined
|
|
# define __iswxxx_defined 1
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
character classifications. */
|
|
typedef unsigned long int wctype_t;
|
|
|
|
# ifndef _ISwbit
|
|
/* The characteristics are stored always in network byte order (big
|
|
endian). We define the bit value interpretations here dependent on the
|
|
machine's byte order. */
|
|
|
|
# include <endian.h>
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
# define _ISwbit(bit) (1 << (bit))
|
|
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
|
# define _ISwbit(bit) \
|
|
((bit) < 8 ? (int) ((1UL << (bit)) << 24) \
|
|
: ((bit) < 16 ? (int) ((1UL << (bit)) << 8) \
|
|
: ((bit) < 24 ? (int) ((1UL << (bit)) >> 8) \
|
|
: (int) ((1UL << (bit)) >> 24))))
|
|
# endif
|
|
|
|
enum
|
|
{
|
|
__ISwupper = 0, /* UPPERCASE. */
|
|
__ISwlower = 1, /* lowercase. */
|
|
__ISwalpha = 2, /* Alphabetic. */
|
|
__ISwdigit = 3, /* Numeric. */
|
|
__ISwxdigit = 4, /* Hexadecimal numeric. */
|
|
__ISwspace = 5, /* Whitespace. */
|
|
__ISwprint = 6, /* Printing. */
|
|
__ISwgraph = 7, /* Graphical. */
|
|
__ISwblank = 8, /* Blank (usually SPC and TAB). */
|
|
__ISwcntrl = 9, /* Control character. */
|
|
__ISwpunct = 10, /* Punctuation. */
|
|
__ISwalnum = 11, /* Alphanumeric. */
|
|
|
|
_ISwupper = _ISwbit (__ISwupper), /* UPPERCASE. */
|
|
_ISwlower = _ISwbit (__ISwlower), /* lowercase. */
|
|
_ISwalpha = _ISwbit (__ISwalpha), /* Alphabetic. */
|
|
_ISwdigit = _ISwbit (__ISwdigit), /* Numeric. */
|
|
_ISwxdigit = _ISwbit (__ISwxdigit), /* Hexadecimal numeric. */
|
|
_ISwspace = _ISwbit (__ISwspace), /* Whitespace. */
|
|
_ISwprint = _ISwbit (__ISwprint), /* Printing. */
|
|
_ISwgraph = _ISwbit (__ISwgraph), /* Graphical. */
|
|
_ISwblank = _ISwbit (__ISwblank), /* Blank (usually SPC and TAB). */
|
|
_ISwcntrl = _ISwbit (__ISwcntrl), /* Control character. */
|
|
_ISwpunct = _ISwbit (__ISwpunct), /* Punctuation. */
|
|
_ISwalnum = _ISwbit (__ISwalnum) /* Alphanumeric. */
|
|
};
|
|
# endif /* Not _ISwbit */
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/*
|
|
* Wide-character classification functions: 7.15.2.1.
|
|
*/
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
true. */
|
|
extern int iswalnum (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character for which `iswupper' or 'iswlower' is
|
|
true, or any wide character that is one of a locale-specific set of
|
|
wide-characters for which none of `iswcntrl', `iswdigit',
|
|
`iswpunct', or `iswspace' is true. */
|
|
extern int iswalpha (wint_t __wc) __THROW;
|
|
|
|
/* Test for any control wide character. */
|
|
extern int iswcntrl (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
extern int iswdigit (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
extern int iswgraph (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a lowercase letter
|
|
or is one of a locale-specific set of wide characters for which
|
|
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int iswlower (wint_t __wc) __THROW;
|
|
|
|
/* Test for any printing wide character. */
|
|
extern int iswprint (wint_t __wc) __THROW;
|
|
|
|
/* Test for any printing wide character that is one of a
|
|
locale-specific et of wide characters for which neither `iswspace'
|
|
nor `iswalnum' is true. */
|
|
extern int iswpunct (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a locale-specific
|
|
set of wide characters for which none of `iswalnum', `iswgraph', or
|
|
`iswpunct' is true. */
|
|
extern int iswspace (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to an uppercase letter
|
|
or is one of a locale-specific set of wide character for which none
|
|
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int iswupper (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a hexadecimal-digit
|
|
character equivalent to that performed be the functions described
|
|
in the previous subclause. */
|
|
extern int iswxdigit (wint_t __wc) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a standard blank
|
|
wide character or a locale-specific set of wide characters for
|
|
which `iswalnum' is false. */
|
|
# ifdef __USE_ISOC99
|
|
extern int iswblank (wint_t __wc) __THROW;
|
|
# endif
|
|
|
|
/*
|
|
* Extensible wide-character classification functions: 7.15.2.2.
|
|
*/
|
|
|
|
/* Construct value that describes a class of wide characters identified
|
|
by the string argument PROPERTY. */
|
|
extern wctype_t wctype (const char *__property) __THROW;
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
extern int iswctype (wint_t __wc, wctype_t __desc) __THROW;
|
|
|
|
|
|
/*
|
|
* Wide-character case-mapping functions: 7.15.3.1.
|
|
*/
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
character mappings. */
|
|
typedef const __int32_t *wctrans_t;
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
extern wint_t towlower (wint_t __wc) __THROW;
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
extern wint_t towupper (wint_t __wc) __THROW;
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* need iswxxx. */
|
|
|
|
|
|
/* The remaining definitions and declarations must not appear in the
|
|
<wchar.h> header. */
|
|
#ifdef _WCTYPE_H
|
|
|
|
/*
|
|
* Extensible wide-character mapping functions: 7.15.3.2.
|
|
*/
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Construct value that describes a mapping between wide characters
|
|
identified by the string argument PROPERTY. */
|
|
extern wctrans_t wctrans (const char *__property) __THROW;
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW;
|
|
|
|
# ifdef __USE_XOPEN2K8
|
|
/* Declare the interface to extended locale model. */
|
|
# include <xlocale.h>
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
true. */
|
|
extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character for which `iswupper' or 'iswlower' is
|
|
true, or any wide character that is one of a locale-specific set of
|
|
wide-characters for which none of `iswcntrl', `iswdigit',
|
|
`iswpunct', or `iswspace' is true. */
|
|
extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any control wide character. */
|
|
extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a lowercase letter
|
|
or is one of a locale-specific set of wide characters for which
|
|
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any printing wide character. */
|
|
extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any printing wide character that is one of a
|
|
locale-specific et of wide characters for which neither `iswspace'
|
|
nor `iswalnum' is true. */
|
|
extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a locale-specific
|
|
set of wide characters for which none of `iswalnum', `iswgraph', or
|
|
`iswpunct' is true. */
|
|
extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to an uppercase letter
|
|
or is one of a locale-specific set of wide character for which none
|
|
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a hexadecimal-digit
|
|
character equivalent to that performed be the functions described
|
|
in the previous subclause. */
|
|
extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Test for any wide character that corresponds to a standard blank
|
|
wide character or a locale-specific set of wide characters for
|
|
which `iswalnum' is false. */
|
|
extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Construct value that describes a class of wide characters identified
|
|
by the string argument PROPERTY. */
|
|
extern wctype_t wctype_l (const char *__property, __locale_t __locale)
|
|
__THROW;
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale)
|
|
__THROW;
|
|
|
|
|
|
/*
|
|
* Wide-character case-mapping functions.
|
|
*/
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW;
|
|
|
|
/* Construct value that describes a mapping between wide characters
|
|
identified by the string argument PROPERTY. */
|
|
extern wctrans_t wctrans_l (const char *__property, __locale_t __locale)
|
|
__THROW;
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc,
|
|
__locale_t __locale) __THROW;
|
|
|
|
# endif /* Use POSIX 2008. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* __WCTYPE_H defined. */
|
|
|
|
#endif /* wctype.h */
|