mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-30 10:45:40 +03: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.
71 lines
2.4 KiB
C
71 lines
2.4 KiB
C
/* -mlong-double-64 compatibility mode for <wchar.h> functions.
|
|
Copyright (C) 2006-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/>. */
|
|
|
|
#ifndef _WCHAR_H
|
|
# error "Never include <bits/wchar-ldbl.h> directly; use <wchar.h> instead."
|
|
#endif
|
|
|
|
#if defined __USE_ISOC95 || defined __USE_UNIX98
|
|
__LDBL_REDIR_DECL (fwprintf);
|
|
__LDBL_REDIR_DECL (wprintf);
|
|
__LDBL_REDIR_DECL (swprintf);
|
|
__LDBL_REDIR_DECL (vfwprintf);
|
|
__LDBL_REDIR_DECL (vwprintf);
|
|
__LDBL_REDIR_DECL (vswprintf);
|
|
# if defined __USE_ISOC99 && !defined __USE_GNU \
|
|
&& !defined __REDIRECT \
|
|
&& (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
|
|
__LDBL_REDIR1_DECL (fwscanf, __nldbl___isoc99_fwscanf)
|
|
__LDBL_REDIR1_DECL (wscanf, __nldbl___isoc99_wscanf)
|
|
__LDBL_REDIR1_DECL (swscanf, __nldbl___isoc99_swscanf)
|
|
# else
|
|
__LDBL_REDIR_DECL (fwscanf);
|
|
__LDBL_REDIR_DECL (wscanf);
|
|
__LDBL_REDIR_DECL (swscanf);
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef __USE_ISOC99
|
|
__LDBL_REDIR1_DECL (wcstold, wcstod);
|
|
# if !defined __USE_GNU && !defined __REDIRECT \
|
|
&& (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
|
|
__LDBL_REDIR1_DECL (vfwscanf, __nldbl___isoc99_vfwscanf)
|
|
__LDBL_REDIR1_DECL (vwscanf, __nldbl___isoc99_vwscanf)
|
|
__LDBL_REDIR1_DECL (vswscanf, __nldbl___isoc99_vswscanf)
|
|
# else
|
|
__LDBL_REDIR_DECL (vfwscanf);
|
|
__LDBL_REDIR_DECL (vwscanf);
|
|
__LDBL_REDIR_DECL (vswscanf);
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
__LDBL_REDIR1_DECL (wcstold_l, wcstod_l);
|
|
#endif
|
|
|
|
#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
|
|
__LDBL_REDIR_DECL (__swprintf_chk)
|
|
__LDBL_REDIR_DECL (__vswprintf_chk)
|
|
# if __USE_FORTIFY_LEVEL > 1
|
|
__LDBL_REDIR_DECL (__fwprintf_chk)
|
|
__LDBL_REDIR_DECL (__wprintf_chk)
|
|
__LDBL_REDIR_DECL (__vfwprintf_chk)
|
|
__LDBL_REDIR_DECL (__vwprintf_chk)
|
|
# endif
|
|
#endif
|