mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08: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.
106 lines
3.5 KiB
C
106 lines
3.5 KiB
C
/* Definitions of status bits for `wait' et al.
|
|
Copyright (C) 1992-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/>. */
|
|
|
|
#if !defined _SYS_WAIT_H && !defined _STDLIB_H
|
|
# error "Never include <bits/waitstatus.h> directly; use <sys/wait.h> instead."
|
|
#endif
|
|
|
|
|
|
/* Everything extant so far uses these same bits. */
|
|
|
|
|
|
/* If WIFEXITED(STATUS), the low-order 8 bits of the status. */
|
|
#define __WEXITSTATUS(status) (((status) & 0xff00) >> 8)
|
|
|
|
/* If WIFSIGNALED(STATUS), the terminating signal. */
|
|
#define __WTERMSIG(status) ((status) & 0x7f)
|
|
|
|
/* If WIFSTOPPED(STATUS), the signal that stopped the child. */
|
|
#define __WSTOPSIG(status) __WEXITSTATUS(status)
|
|
|
|
/* Nonzero if STATUS indicates normal termination. */
|
|
#define __WIFEXITED(status) (__WTERMSIG(status) == 0)
|
|
|
|
/* Nonzero if STATUS indicates termination by a signal. */
|
|
#define __WIFSIGNALED(status) \
|
|
(((signed char) (((status) & 0x7f) + 1) >> 1) > 0)
|
|
|
|
/* Nonzero if STATUS indicates the child is stopped. */
|
|
#define __WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
|
|
|
|
/* Nonzero if STATUS indicates the child continued after a stop. We only
|
|
define this if <bits/waitflags.h> provides the WCONTINUED flag bit. */
|
|
#ifdef WCONTINUED
|
|
# define __WIFCONTINUED(status) ((status) == __W_CONTINUED)
|
|
#endif
|
|
|
|
/* Nonzero if STATUS indicates the child dumped core. */
|
|
#define __WCOREDUMP(status) ((status) & __WCOREFLAG)
|
|
|
|
/* Macros for constructing status values. */
|
|
#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
|
|
#define __W_STOPCODE(sig) ((sig) << 8 | 0x7f)
|
|
#define __W_CONTINUED 0xffff
|
|
#define __WCOREFLAG 0x80
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
|
|
# include <endian.h>
|
|
|
|
union wait
|
|
{
|
|
int w_status;
|
|
struct
|
|
{
|
|
# if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
unsigned int __w_termsig:7; /* Terminating signal. */
|
|
unsigned int __w_coredump:1; /* Set if dumped core. */
|
|
unsigned int __w_retcode:8; /* Return code if exited normally. */
|
|
unsigned int:16;
|
|
# endif /* Little endian. */
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
unsigned int:16;
|
|
unsigned int __w_retcode:8;
|
|
unsigned int __w_coredump:1;
|
|
unsigned int __w_termsig:7;
|
|
# endif /* Big endian. */
|
|
} __wait_terminated;
|
|
struct
|
|
{
|
|
# if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
unsigned int __w_stopval:8; /* W_STOPPED if stopped. */
|
|
unsigned int __w_stopsig:8; /* Stopping signal. */
|
|
unsigned int:16;
|
|
# endif /* Little endian. */
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
unsigned int:16;
|
|
unsigned int __w_stopsig:8; /* Stopping signal. */
|
|
unsigned int __w_stopval:8; /* W_STOPPED if stopped. */
|
|
# endif /* Big endian. */
|
|
} __wait_stopped;
|
|
};
|
|
|
|
# define w_termsig __wait_terminated.__w_termsig
|
|
# define w_coredump __wait_terminated.__w_coredump
|
|
# define w_retcode __wait_terminated.__w_retcode
|
|
# define w_stopsig __wait_stopped.__w_stopsig
|
|
# define w_stopval __wait_stopped.__w_stopval
|
|
|
|
#endif /* Use misc. */
|