mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-30 10:45:40 +03:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
80 lines
2.7 KiB
C
80 lines
2.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/>. */
|
|
|
|
#ifndef _SIGNAL_H
|
|
# error "Never include <bits/sigaction.h> directly; use <signal.h> instead."
|
|
#endif
|
|
|
|
/* These definitions match those used by the 4.4 BSD kernel.
|
|
If the operating system has a `sigaction' system call that correctly
|
|
implements the POSIX.1 behavior, there should be a system-dependent
|
|
version of this file that defines `struct sigaction' and the `SA_*'
|
|
constants appropriately. */
|
|
|
|
/* Structure describing the action to be taken when a signal arrives. */
|
|
struct sigaction
|
|
{
|
|
/* Signal handler. */
|
|
#ifdef __USE_POSIX199309
|
|
union
|
|
{
|
|
/* Used if SA_SIGINFO is not set. */
|
|
__sighandler_t sa_handler;
|
|
/* Used if SA_SIGINFO is set. */
|
|
void (*sa_sigaction) (int, siginfo_t *, void *);
|
|
}
|
|
__sigaction_handler;
|
|
# define sa_handler __sigaction_handler.sa_handler
|
|
# define sa_sigaction __sigaction_handler.sa_sigaction
|
|
#else
|
|
__sighandler_t sa_handler;
|
|
#endif
|
|
|
|
/* Additional set of signals to be blocked. */
|
|
__sigset_t sa_mask;
|
|
|
|
/* Special flags. */
|
|
int sa_flags;
|
|
};
|
|
|
|
/* Bits in `sa_flags'. */
|
|
#if defined __USE_UNIX98 || defined __USE_MISC
|
|
# define SA_ONSTACK 0x0001 /* Take signal on signal stack. */
|
|
#endif
|
|
#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
|
|
# define SA_RESTART 0x0002 /* Restart syscall on signal return. */
|
|
# define SA_NODEFER 0x0010 /* Don't automatically block the signal when
|
|
its handler is being executed. */
|
|
# define SA_RESETHAND 0x0004 /* Reset to SIG_DFL on entry to handler. */
|
|
#endif
|
|
#define SA_NOCLDSTOP 0x0008 /* Don't send SIGCHLD when children stop. */
|
|
|
|
#ifdef __USE_MISC
|
|
# define SA_INTERRUPT 0 /* Historical no-op ("not SA_RESTART"). */
|
|
|
|
/* Some aliases for the SA_ constants. */
|
|
# define SA_NOMASK SA_NODEFER
|
|
# define SA_ONESHOT SA_RESETHAND
|
|
# define SA_STACK SA_ONSTACK
|
|
#endif
|
|
|
|
|
|
/* Values for the HOW argument to `sigprocmask'. */
|
|
#define SIG_BLOCK 1 /* Block signals. */
|
|
#define SIG_UNBLOCK 2 /* Unblock signals. */
|
|
#define SIG_SETMASK 3 /* Set the set of blocked signals. */
|