From 2072f5c34ede81dde9e0d953d57a0690a66b0f12 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 16 Mar 2017 13:31:57 +0000 Subject: Remove C++ namespace handling from glibc headers. 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 , 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. --- wctype/wctype.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'wctype') diff --git a/wctype/wctype.h b/wctype/wctype.h index 20cb820e4d..73165bbda2 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -46,11 +46,9 @@ #ifndef __iswxxx_defined # define __iswxxx_defined 1 -__BEGIN_NAMESPACE_C99 /* Scalar type that can hold values which represent locale-specific character classifications. */ typedef unsigned long int wctype_t; -__END_NAMESPACE_C99 # ifndef _ISwbit /* The characteristics are stored always in network byte order (big @@ -101,7 +99,6 @@ enum __BEGIN_DECLS -__BEGIN_NAMESPACE_C99 /* * Wide-character classification functions: 7.15.2.1. */ @@ -173,29 +170,21 @@ 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; -__END_NAMESPACE_C99 /* * Wide-character case-mapping functions: 7.15.3.1. */ -__BEGIN_NAMESPACE_C99 /* Scalar type that can hold values which represent locale-specific character mappings. */ typedef const __int32_t *wctrans_t; -__END_NAMESPACE_C99 -#ifdef __USE_GNU -__USING_NAMESPACE_C99(wctrans_t) -#endif -__BEGIN_NAMESPACE_C99 /* 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_NAMESPACE_C99 __END_DECLS @@ -212,14 +201,12 @@ __END_DECLS __BEGIN_DECLS -__BEGIN_NAMESPACE_C99 /* 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; -__END_NAMESPACE_C99 # ifdef __USE_XOPEN2K8 /* Declare the interface to extended locale model. */ -- cgit 1.4.1