Fix POSIX namespace for <bits/siginfo.h> (bug 16674).
authorJoseph Myers <joseph@codesourcery.com>
Fri, 7 Mar 2014 23:57:56 +0000 (23:57 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Fri, 7 Mar 2014 23:57:56 +0000 (23:57 +0000)
<bits/siginfo.h> causes symbols ILL_*, FPE_*, SEGV_* BUS_*, CLD_*,
POLL_* and TRAP_* to be exposed in <signal.h> (and <sys/wait.h>), even
though those symbols are not in non-XSI POSIX before POSIX.1-2008 and
even in POSIX.1-2008 the TRAP_* symbols are XSI-only.  This patch
conditions the symbols appropriately in the various <bits/siginfo.h>
implementations (various <signal.h> and <sys/wait.h> conformtest
issues remain for standards other than POSIX (1995/6)).  Tested
x86_64.

[BZ #16674]
* bits/siginfo.h (ILL_ILLOPC): Condition on [__USE_XOPEN_EXTENDED
|| __USE_XOPEN2K8].
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (ILL_ILLOPC):
Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/bits/siginfo.h (ILL_ILLOPC): Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (ILL_ILLOPC):
Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(ILL_BADIADDR): Likewise.
(ILL_BREAK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(FPE_DECOVF): Likewise.
(FPE_DECDIV): Likewise.
(FPE_DECERR): Likewise.
(FPE_INVASC): Likewise.
(FPE_INVDEC): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(SEGV_PSTKOVF): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(TRAP_BRANCH): Likewise.
(TRAP_HWBKPT): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/mips/bits/siginfo.h (ILL_ILLOPC): Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/s390/bits/siginfo.h (ILL_ILLOPC): Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/siginfo.h (ILL_ILLOPC): Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/tile/bits/siginfo.h (ILL_ILLOPC): Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(ILL_DBLFLT): Likewise.
(ILL_HARDWALL): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* sysdeps/unix/sysv/linux/x86/bits/siginfo.h (ILL_ILLOPC): Likewise.
(ILL_ILLOPN): Likewise.
(ILL_ILLADR): Likewise.
(ILL_ILLTRP): Likewise.
(ILL_PRVOPC): Likewise.
(ILL_PRVREG): Likewise.
(ILL_COPROC): Likewise.
(ILL_BADSTK): Likewise.
(FPE_INTDIV): Likewise.
(FPE_INTOVF): Likewise.
(FPE_FLTDIV): Likewise.
(FPE_FLTOVF): Likewise.
(FPE_FLTUND): Likewise.
(FPE_FLTRES): Likewise.
(FPE_FLTINV): Likewise.
(FPE_FLTSUB): Likewise.
(SEGV_MAPERR): Likewise.
(SEGV_ACCERR): Likewise.
(BUS_ADRALN): Likewise.
(BUS_ADRERR): Likewise.
(BUS_OBJERR): Likewise.
(BUS_MCEERR_AR): Likewise.
(BUS_MCEERR_AO): Likewise.
(TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
(TRAP_TRACE): Likewise.
(CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
__USE_XOPEN2K8].
(CLD_KILLED): Likewise.
(CLD_DUMPED): Likewise.
(CLD_TRAPPED): Likewise.
(CLD_STOPPED): Likewise.
(CLD_CONTINUED): Likewise.
(POLL_IN): Likewise.
(POLL_OUT): Likewise.
(POLL_MSG): Likewise.
(POLL_ERR): Likewise.
(POLL_PRI): Likewise.
(POLL_HUP): Likewise.
* conform/Makefile (test-xfail-POSIX/signal.h/conform): Remove.
(test-xfail-POSIX/sys/wait.h/conform): Likewise.

12 files changed:
ChangeLog
NEWS
bits/siginfo.h
conform/Makefile
sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
sysdeps/unix/sysv/linux/bits/siginfo.h
sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
sysdeps/unix/sysv/linux/mips/bits/siginfo.h
sysdeps/unix/sysv/linux/s390/bits/siginfo.h
sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
sysdeps/unix/sysv/linux/tile/bits/siginfo.h
sysdeps/unix/sysv/linux/x86/bits/siginfo.h

index c0ebdc6..a394558 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,364 @@
 2014-03-07  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #16674]
+       * bits/siginfo.h (ILL_ILLOPC): Condition on [__USE_XOPEN_EXTENDED
+       || __USE_XOPEN2K8].
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/alpha/bits/siginfo.h (ILL_ILLOPC):
+       Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/bits/siginfo.h (ILL_ILLOPC): Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (ILL_ILLOPC):
+       Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (ILL_BADIADDR): Likewise.
+       (ILL_BREAK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (FPE_DECOVF): Likewise.
+       (FPE_DECDIV): Likewise.
+       (FPE_DECERR): Likewise.
+       (FPE_INVASC): Likewise.
+       (FPE_INVDEC): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (SEGV_PSTKOVF): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (TRAP_BRANCH): Likewise.
+       (TRAP_HWBKPT): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/mips/bits/siginfo.h (ILL_ILLOPC): Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/siginfo.h (ILL_ILLOPC): Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h (ILL_ILLOPC): Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/tile/bits/siginfo.h (ILL_ILLOPC): Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (ILL_DBLFLT): Likewise.
+       (ILL_HARDWALL): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * sysdeps/unix/sysv/linux/x86/bits/siginfo.h (ILL_ILLOPC): Likewise.
+       (ILL_ILLOPN): Likewise.
+       (ILL_ILLADR): Likewise.
+       (ILL_ILLTRP): Likewise.
+       (ILL_PRVOPC): Likewise.
+       (ILL_PRVREG): Likewise.
+       (ILL_COPROC): Likewise.
+       (ILL_BADSTK): Likewise.
+       (FPE_INTDIV): Likewise.
+       (FPE_INTOVF): Likewise.
+       (FPE_FLTDIV): Likewise.
+       (FPE_FLTOVF): Likewise.
+       (FPE_FLTUND): Likewise.
+       (FPE_FLTRES): Likewise.
+       (FPE_FLTINV): Likewise.
+       (FPE_FLTSUB): Likewise.
+       (SEGV_MAPERR): Likewise.
+       (SEGV_ACCERR): Likewise.
+       (BUS_ADRALN): Likewise.
+       (BUS_ADRERR): Likewise.
+       (BUS_OBJERR): Likewise.
+       (BUS_MCEERR_AR): Likewise.
+       (BUS_MCEERR_AO): Likewise.
+       (TRAP_BRKPT): Condition on [__USE_XOPEN_EXTENDED].
+       (TRAP_TRACE): Likewise.
+       (CLD_EXITED): Condition on [__USE_XOPEN_EXTENDED ||
+       __USE_XOPEN2K8].
+       (CLD_KILLED): Likewise.
+       (CLD_DUMPED): Likewise.
+       (CLD_TRAPPED): Likewise.
+       (CLD_STOPPED): Likewise.
+       (CLD_CONTINUED): Likewise.
+       (POLL_IN): Likewise.
+       (POLL_OUT): Likewise.
+       (POLL_MSG): Likewise.
+       (POLL_ERR): Likewise.
+       (POLL_PRI): Likewise.
+       (POLL_HUP): Likewise.
+       * conform/Makefile (test-xfail-POSIX/signal.h/conform): Remove.
+       (test-xfail-POSIX/sys/wait.h/conform): Likewise.
+
        [BZ #16670]
        * posix/sched.h [!__USE_XOPEN2K] (__need_time_t): Don't define
        before #include of <time.h>.
diff --git a/NEWS b/NEWS
index 2e55672..35481c7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.20
 * The following bugs are resolved with this release:
 
   15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610,
-  16611, 16613, 16623, 16632, 16670.
+  16611, 16613, 16623, 16632, 16670, 16674.
 
 * The am33 port, which had not worked for several years, has been removed
   from ports.
index f77d952..db268d5 100644 (file)
@@ -70,110 +70,116 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR                   /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index e8c9a9a..e1df914 100644 (file)
@@ -188,8 +188,6 @@ test-xfail-XPG4/termios.h/conform = yes
 test-xfail-XPG4/ucontext.h/conform = yes
 test-xfail-XPG4/unistd.h/conform = yes
 test-xfail-XPG4/utmpx.h/conform = yes
-test-xfail-POSIX/signal.h/conform = yes
-test-xfail-POSIX/sys/wait.h/conform = yes
 test-xfail-POSIX/tar.h/conform = yes
 test-xfail-UNIX98/arpa/inet.h/conform = yes
 test-xfail-UNIX98/fcntl.h/conform = yes
index 9334ab8..d1dcfa2 100644 (file)
@@ -157,114 +157,120 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index d71cc9d..ae603e8 100644 (file)
@@ -161,114 +161,120 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index bf62112..fa95417 100644 (file)
@@ -154,144 +154,150 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK,                  /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
   ILL_BADIADDR                 /* Unimplemented instruction address. */
-# define ILL_BADIADDR  ILL_BADIADDR
+#  define ILL_BADIADDR ILL_BADIADDR
 
-# ifdef __USE_GNU
+#  ifdef __USE_GNU
    , ILL_BREAK
-#  define ILL_BREAK    ILL_BREAK
-# endif
+#   define ILL_BREAK   ILL_BREAK
+#  endif
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
-# ifdef __USE_GNU
+#  define FPE_FLTSUB   FPE_FLTSUB
+#  ifdef __USE_GNU
    , FPE_DECOVF
-#  define FPE_DECOVF   FPE_DECOVF
+#   define FPE_DECOVF  FPE_DECOVF
    , FPE_DECDIV
-#  define FPE_DECDIV   FPE_DECDIV
+#   define FPE_DECDIV  FPE_DECDIV
    , FPE_DECERR
-#  define FPE_DECERR   FPE_DECERR
+#   define FPE_DECERR  FPE_DECERR
    , FPE_INVASC
-#  define FPE_INVASC   FPE_INVASC
+#   define FPE_INVASC  FPE_INVASC
    , FPE_INVDEC
-#  define FPE_INVDEC   FPE_INVDEC
-# endif
+#   define FPE_INVDEC  FPE_INVDEC
+#  endif
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
-# ifdef __USE_GNU
+#  define SEGV_ACCERR  SEGV_ACCERR
+#  ifdef __USE_GNU
   , SEGV_PSTKOVF               /* Paragraph stack overflow. */
-# define SEGV_PSTKOVF  SEGV_PSTKOVF
-# endif
+#   define SEGV_PSTKOVF        SEGV_PSTKOVF
+#  endif
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 
-# ifdef __USE_GNU
+#  ifdef __USE_GNU
   , TRAP_BRANCH
-# define TRAP_BRANCH   TRAP_BRANCH
+#   define TRAP_BRANCH TRAP_BRANCH
   , TRAP_HWBKPT
-# define TRAP_HWBKPT   TRAP_HWBKPT
-# endif
+#   define TRAP_HWBKPT TRAP_HWBKPT
+#  endif
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index eaabc30..8812a56 100644 (file)
@@ -153,114 +153,120 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap.  */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index e85ab06..0958a5f 100644 (file)
@@ -161,114 +161,120 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal. */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal. */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.         */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal. */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.         */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.         */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.         */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index 69e606e..6c145ce 100644 (file)
@@ -163,114 +163,120 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 /* `si_code' values for SIGEMT signal.  */
 enum
index 089edb2..c75c429 100644 (file)
@@ -163,118 +163,124 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK,                  /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
   ILL_DBLFLT,                  /* Double fault.  */
-# define ILL_DBLFLT    ILL_DBLFLT
+#  define ILL_DBLFLT   ILL_DBLFLT
   ILL_HARDWALL                 /* User networks hardwall violation.  */
-# define ILL_HARDWALL  ILL_HARDWALL
+#  define ILL_HARDWALL ILL_HARDWALL
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */
index 44f293e..759fc3e 100644 (file)
@@ -173,114 +173,120 @@ enum
 };
 
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGILL signal.  */
 enum
 {
   ILL_ILLOPC = 1,              /* Illegal opcode.  */
-# define ILL_ILLOPC    ILL_ILLOPC
+#  define ILL_ILLOPC   ILL_ILLOPC
   ILL_ILLOPN,                  /* Illegal operand.  */
-# define ILL_ILLOPN    ILL_ILLOPN
+#  define ILL_ILLOPN   ILL_ILLOPN
   ILL_ILLADR,                  /* Illegal addressing mode.  */
-# define ILL_ILLADR    ILL_ILLADR
+#  define ILL_ILLADR   ILL_ILLADR
   ILL_ILLTRP,                  /* Illegal trap. */
-# define ILL_ILLTRP    ILL_ILLTRP
+#  define ILL_ILLTRP   ILL_ILLTRP
   ILL_PRVOPC,                  /* Privileged opcode.  */
-# define ILL_PRVOPC    ILL_PRVOPC
+#  define ILL_PRVOPC   ILL_PRVOPC
   ILL_PRVREG,                  /* Privileged register.  */
-# define ILL_PRVREG    ILL_PRVREG
+#  define ILL_PRVREG   ILL_PRVREG
   ILL_COPROC,                  /* Coprocessor error.  */
-# define ILL_COPROC    ILL_COPROC
+#  define ILL_COPROC   ILL_COPROC
   ILL_BADSTK                   /* Internal stack error.  */
-# define ILL_BADSTK    ILL_BADSTK
+#  define ILL_BADSTK   ILL_BADSTK
 };
 
 /* `si_code' values for SIGFPE signal.  */
 enum
 {
   FPE_INTDIV = 1,              /* Integer divide by zero.  */
-# define FPE_INTDIV    FPE_INTDIV
+#  define FPE_INTDIV   FPE_INTDIV
   FPE_INTOVF,                  /* Integer overflow.  */
-# define FPE_INTOVF    FPE_INTOVF
+#  define FPE_INTOVF   FPE_INTOVF
   FPE_FLTDIV,                  /* Floating point divide by zero.  */
-# define FPE_FLTDIV    FPE_FLTDIV
+#  define FPE_FLTDIV   FPE_FLTDIV
   FPE_FLTOVF,                  /* Floating point overflow.  */
-# define FPE_FLTOVF    FPE_FLTOVF
+#  define FPE_FLTOVF   FPE_FLTOVF
   FPE_FLTUND,                  /* Floating point underflow.  */
-# define FPE_FLTUND    FPE_FLTUND
+#  define FPE_FLTUND   FPE_FLTUND
   FPE_FLTRES,                  /* Floating point inexact result.  */
-# define FPE_FLTRES    FPE_FLTRES
+#  define FPE_FLTRES   FPE_FLTRES
   FPE_FLTINV,                  /* Floating point invalid operation.  */
-# define FPE_FLTINV    FPE_FLTINV
+#  define FPE_FLTINV   FPE_FLTINV
   FPE_FLTSUB                   /* Subscript out of range.  */
-# define FPE_FLTSUB    FPE_FLTSUB
+#  define FPE_FLTSUB   FPE_FLTSUB
 };
 
 /* `si_code' values for SIGSEGV signal.  */
 enum
 {
   SEGV_MAPERR = 1,             /* Address not mapped to object.  */
-# define SEGV_MAPERR   SEGV_MAPERR
+#  define SEGV_MAPERR  SEGV_MAPERR
   SEGV_ACCERR                  /* Invalid permissions for mapped object.  */
-# define SEGV_ACCERR   SEGV_ACCERR
+#  define SEGV_ACCERR  SEGV_ACCERR
 };
 
 /* `si_code' values for SIGBUS signal.  */
 enum
 {
   BUS_ADRALN = 1,              /* Invalid address alignment.  */
-# define BUS_ADRALN    BUS_ADRALN
+#  define BUS_ADRALN   BUS_ADRALN
   BUS_ADRERR,                  /* Non-existant physical address.  */
-# define BUS_ADRERR    BUS_ADRERR
+#  define BUS_ADRERR   BUS_ADRERR
   BUS_OBJERR,                  /* Object specific hardware error.  */
-# define BUS_OBJERR    BUS_OBJERR
+#  define BUS_OBJERR   BUS_OBJERR
   BUS_MCEERR_AR,               /* Hardware memory error: action required.  */
-# define BUS_MCEERR_AR BUS_MCEERR_AR
+#  define BUS_MCEERR_AR        BUS_MCEERR_AR
   BUS_MCEERR_AO                        /* Hardware memory error: action optional.  */
-# define BUS_MCEERR_AO BUS_MCEERR_AO
+#  define BUS_MCEERR_AO        BUS_MCEERR_AO
 };
+# endif
 
+# ifdef __USE_XOPEN_EXTENDED
 /* `si_code' values for SIGTRAP signal.  */
 enum
 {
   TRAP_BRKPT = 1,              /* Process breakpoint.  */
-# define TRAP_BRKPT    TRAP_BRKPT
+#  define TRAP_BRKPT   TRAP_BRKPT
   TRAP_TRACE                   /* Process trace trap.  */
-# define TRAP_TRACE    TRAP_TRACE
+#  define TRAP_TRACE   TRAP_TRACE
 };
+# endif
 
+# if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8
 /* `si_code' values for SIGCHLD signal.  */
 enum
 {
   CLD_EXITED = 1,              /* Child has exited.  */
-# define CLD_EXITED    CLD_EXITED
+#  define CLD_EXITED   CLD_EXITED
   CLD_KILLED,                  /* Child was killed.  */
-# define CLD_KILLED    CLD_KILLED
+#  define CLD_KILLED   CLD_KILLED
   CLD_DUMPED,                  /* Child terminated abnormally.  */
-# define CLD_DUMPED    CLD_DUMPED
+#  define CLD_DUMPED   CLD_DUMPED
   CLD_TRAPPED,                 /* Traced child has trapped.  */
-# define CLD_TRAPPED   CLD_TRAPPED
+#  define CLD_TRAPPED  CLD_TRAPPED
   CLD_STOPPED,                 /* Child has stopped.  */
-# define CLD_STOPPED   CLD_STOPPED
+#  define CLD_STOPPED  CLD_STOPPED
   CLD_CONTINUED                        /* Stopped child has continued.  */
-# define CLD_CONTINUED CLD_CONTINUED
+#  define CLD_CONTINUED        CLD_CONTINUED
 };
 
 /* `si_code' values for SIGPOLL signal.  */
 enum
 {
   POLL_IN = 1,                 /* Data input available.  */
-# define POLL_IN       POLL_IN
+#  define POLL_IN      POLL_IN
   POLL_OUT,                    /* Output buffers available.  */
-# define POLL_OUT      POLL_OUT
+#  define POLL_OUT     POLL_OUT
   POLL_MSG,                    /* Input message available.   */
-# define POLL_MSG      POLL_MSG
+#  define POLL_MSG     POLL_MSG
   POLL_ERR,                    /* I/O error.  */
-# define POLL_ERR      POLL_ERR
+#  define POLL_ERR     POLL_ERR
   POLL_PRI,                    /* High priority input available.  */
-# define POLL_PRI      POLL_PRI
+#  define POLL_PRI     POLL_PRI
   POLL_HUP                     /* Device disconnected.  */
-# define POLL_HUP      POLL_HUP
+#  define POLL_HUP     POLL_HUP
 };
+# endif
 
 # undef __need_siginfo_t
 #endif /* !have siginfo_t && (have _SIGNAL_H || need siginfo_t).  */