move bits/signal.h include close to the top of signal.h

only have code above the bits/signal.h include that is necessary.
(some types are used for the ucontext struct and mips has to
override a few macro definitions)

this way mips bits/signal.h will be able to affect siginfo_t.
This commit is contained in:
Szabolcs Nagy 2016-01-27 00:40:32 +00:00 committed by Rich Felker
parent c243d6f095
commit 22f84829af
1 changed files with 12 additions and 6 deletions

View File

@ -27,8 +27,6 @@ extern "C" {
#include <bits/alltypes.h> #include <bits/alltypes.h>
#define SIG_HOLD ((void (*)(int)) 2)
#define SIG_BLOCK 0 #define SIG_BLOCK 0
#define SIG_UNBLOCK 1 #define SIG_UNBLOCK 1
#define SIG_SETMASK 2 #define SIG_SETMASK 2
@ -43,6 +41,18 @@ extern "C" {
#define SI_USER 0 #define SI_USER 0
#define SI_KERNEL 128 #define SI_KERNEL 128
typedef struct sigaltstack stack_t;
#endif
#include <bits/signal.h>
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
|| defined(_BSD_SOURCE)
#define SIG_HOLD ((void (*)(int)) 2)
#define FPE_INTDIV 1 #define FPE_INTDIV 1
#define FPE_INTOVF 2 #define FPE_INTOVF 2
#define FPE_FLTDIV 3 #define FPE_FLTDIV 3
@ -78,8 +88,6 @@ extern "C" {
#define CLD_STOPPED 5 #define CLD_STOPPED 5
#define CLD_CONTINUED 6 #define CLD_CONTINUED 6
typedef struct sigaltstack stack_t;
union sigval { union sigval {
int sival_int; int sival_int;
void *sival_ptr; void *sival_ptr;
@ -240,8 +248,6 @@ int sigandset(sigset_t *, const sigset_t *, const sigset_t *);
#define SA_ONESHOT SA_RESETHAND #define SA_ONESHOT SA_RESETHAND
#endif #endif
#include <bits/signal.h>
#define SIG_ERR ((void (*)(int))-1) #define SIG_ERR ((void (*)(int))-1)
#define SIG_DFL ((void (*)(int)) 0) #define SIG_DFL ((void (*)(int)) 0)
#define SIG_IGN ((void (*)(int)) 1) #define SIG_IGN ((void (*)(int)) 1)