mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +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.
107 lines
3.6 KiB
C
107 lines
3.6 KiB
C
/* Copyright (C) 1991-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.13 Nonlocal jumps <setjmp.h>
|
|
*/
|
|
|
|
#ifndef _SETJMP_H
|
|
#define _SETJMP_H 1
|
|
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#include <bits/setjmp.h> /* Get `__jmp_buf'. */
|
|
#include <bits/sigset.h> /* Get `__sigset_t'. */
|
|
|
|
|
|
/* Calling environment, plus possibly a saved signal mask. */
|
|
struct __jmp_buf_tag
|
|
{
|
|
/* NOTE: The machine-dependent definitions of `__sigsetjmp'
|
|
assume that a `jmp_buf' begins with a `__jmp_buf' and that
|
|
`__mask_was_saved' follows it. Do not move these members
|
|
or add others before it. */
|
|
__jmp_buf __jmpbuf; /* Calling environment. */
|
|
int __mask_was_saved; /* Saved the signal mask? */
|
|
__sigset_t __saved_mask; /* Saved signal mask. */
|
|
};
|
|
|
|
|
|
typedef struct __jmp_buf_tag jmp_buf[1];
|
|
|
|
/* Store the calling environment in ENV, also saving the signal mask.
|
|
Return 0. */
|
|
extern int setjmp (jmp_buf __env) __THROWNL;
|
|
|
|
/* Store the calling environment in ENV, also saving the
|
|
signal mask if SAVEMASK is nonzero. Return 0.
|
|
This is the internal name for `sigsetjmp'. */
|
|
extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __THROWNL;
|
|
|
|
/* Store the calling environment in ENV, not saving the signal mask.
|
|
Return 0. */
|
|
extern int _setjmp (struct __jmp_buf_tag __env[1]) __THROWNL;
|
|
|
|
/* Do not save the signal mask. This is equivalent to the `_setjmp'
|
|
BSD function. */
|
|
#define setjmp(env) _setjmp (env)
|
|
|
|
|
|
/* Jump to the environment saved in ENV, making the
|
|
`setjmp' call there return VAL, or 1 if VAL is 0. */
|
|
extern void longjmp (struct __jmp_buf_tag __env[1], int __val)
|
|
__THROWNL __attribute__ ((__noreturn__));
|
|
|
|
#if defined __USE_MISC || defined __USE_XOPEN
|
|
/* Same. Usually `_longjmp' is used with `_setjmp', which does not save
|
|
the signal mask. But it is how ENV was saved that determines whether
|
|
`longjmp' restores the mask; `_longjmp' is just an alias. */
|
|
extern void _longjmp (struct __jmp_buf_tag __env[1], int __val)
|
|
__THROWNL __attribute__ ((__noreturn__));
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_POSIX
|
|
/* Use the same type for `jmp_buf' and `sigjmp_buf'.
|
|
The `__mask_was_saved' flag determines whether
|
|
or not `longjmp' will restore the signal mask. */
|
|
typedef struct __jmp_buf_tag sigjmp_buf[1];
|
|
|
|
/* Store the calling environment in ENV, also saving the
|
|
signal mask if SAVEMASK is nonzero. Return 0. */
|
|
# define sigsetjmp(env, savemask) __sigsetjmp (env, savemask)
|
|
|
|
/* Jump to the environment saved in ENV, making the
|
|
sigsetjmp call there return VAL, or 1 if VAL is 0.
|
|
Restore the signal mask if that sigsetjmp call saved it.
|
|
This is just an alias `longjmp'. */
|
|
extern void siglongjmp (sigjmp_buf __env, int __val)
|
|
__THROWNL __attribute__ ((__noreturn__));
|
|
#endif /* Use POSIX. */
|
|
|
|
|
|
/* Define helper functions to catch unsafe code. */
|
|
#if __USE_FORTIFY_LEVEL > 0
|
|
# include <bits/setjmp2.h>
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* setjmp.h */
|