mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
498afc54df
This patch cleans up following the obsoletion of _BSD_SOURCE and _SVID_SOURCE by combining __USE_BSD and __USE_SVID into __USE_MISC. The only non-mechanical part of this patch is the changes to features.h; everything else is simple substitution of __USE_MISC for the old macros. Thus, this patch leaves obviously redundant conditionals such as "defined __USE_MISC || defined __USE_MISC", and does not update #endif comments where they referred to BSD or SVID in words instead of the literal macro name. This is intended to facilitate patch review by separating the less mechanical changes from these purely mechanical changes into a separate patch. (I do intend to integrate all the changes from <https://sourceware.org/ml/libc-alpha/2013-12/msg00226.html>, which I believe includes all the trailing comment updates, in subsequent patches.) Tested x86_64. * include/features.h (__USE_BSD): Remove macro definitions. (__USE_SVID): Likewise. (_BSD_SOURCE): Likewise. (_SVID_SOURCE): Likewise. [!defined _BSD_SOURCE && !defined _SVID_SOURCE]: Remove condition from definition of _DEFAULT_SOURCE. [_BSD_SOURCE || _SVID_SOURCE]: Change condition to [_DEFAULT_SOURCE]. * bits/fcntl.h [__USE_BSD]: Change condition to [__USE_MISC]. * bits/mman.h [__USE_BSD]: Likewise. * bits/termios.h [__USE_BSD]: Likewise. * bits/waitstatus.h [__USE_BSD]: Likewise. * ctype/ctype.h [__USE_SVID]: Likewise. * dirent/dirent.h [__USE_BSD]: Likewise. * grp/grp.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * inet/netinet/igmp.h [__USE_BSD]: Likewise. * io/fcntl.h [__USE_BSD]: Likewise. * io/ftw.h [__USE_BSD]: Likewise. * io/sys/stat.h [__USE_BSD]: Likewise. * libio/bits/stdio-ldbl.h [__USE_BSD]: Likewise. * libio/bits/stdio2.h [__USE_BSD]: Likewise. * libio/stdio.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * math/math.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * misc/bits/syslog-ldbl.h [__USE_BSD]: Likewise. * misc/bits/syslog.h [__USE_BSD]: Likewise. * misc/search.h [__USE_SVID]: Likewise. * misc/sys/mman.h [__USE_BSD]: Likewise. * misc/sys/syslog.h [__USE_BSD]: Likewise. * misc/sys/uio.h [__USE_BSD]: Likewise. * posix/bits/unistd.h [__USE_BSD]: Likewise. * posix/glob.h [__USE_BSD]: Likewise. * posix/regex.h [__USE_BSD]: Likewise. * posix/sys/types.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/sys/utsname.h [__USE_SVID]: Likewise. * posix/sys/wait.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * posix/unistd.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * pwd/pwd.h [__USE_SVID]: Likewise. * resolv/netdb.h [__USE_BSD]: Likewise. * setjmp/setjmp.h [__USE_BSD]: Likewise. * signal/signal.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * socket/sys/socket.h [__USE_BSD]: Likewise. * stdlib/fmtmsg.h [__USE_SVID]: Likewise. * stdlib/stdlib.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string2.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * string/bits/string3.h [__USE_BSD]: Likewise. * string/endian.h [__USE_BSD]: Likewise. * string/string.h [__USE_SVID]: Likewise. [__USE_BSD]: Likewise. * string/strings.h [__USE_BSD]: Likewise. * sysdeps/generic/netinet/ip.h [__USE_BSD]: Likewise. * sysdeps/gnu/netinet/ip_icmp.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_BSD]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/sys_errlist.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_ether.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_fddi.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/netinet/if_tr.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/termios.h [__USE_BSD]: Likewise. * sysdeps/x86/bits/string.h [__USE_BSD]: Likewise. * sysvipc/sys/ipc.h [__USE_SVID]: Likewise. * termios/termios.h [__USE_BSD]: Likewise. * time/sys/time.h [__USE_BSD]: Likewise. * time/time.h [__USE_BSD]: Likewise. [__USE_SVID]: Likewise. * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_BSD]: Change condition to [__USE_MISC].
115 lines
3.7 KiB
C
115 lines
3.7 KiB
C
/* Copyright (C) 1991-2014 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. */
|
|
};
|
|
|
|
|
|
__BEGIN_NAMESPACE_STD
|
|
|
|
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;
|
|
|
|
__END_NAMESPACE_STD
|
|
|
|
/* 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)
|
|
|
|
|
|
__BEGIN_NAMESPACE_STD
|
|
|
|
/* 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__));
|
|
|
|
__END_NAMESPACE_STD
|
|
|
|
#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 */
|