diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-25 09:29:28 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-04-25 09:29:40 -0700 |
| commit | 203aae7d79be8609e61844593cb40b90ae8a0b30 (patch) | |
| tree | 59d4d46ad3e56f2a322676955c7cde3a4528ba8e | |
| parent | 94179a509ee3f6ba7b4ba45fb90477b01049dab8 (diff) | |
| parent | 1e343cb119fde897b0eb6503f114edf20e9b3532 (diff) | |
| download | bionic-203aae7d79be8609e61844593cb40b90ae8a0b30.zip bionic-203aae7d79be8609e61844593cb40b90ae8a0b30.tar.gz bionic-203aae7d79be8609e61844593cb40b90ae8a0b30.tar.bz2 | |
Merge from AOSP
Change-Id: If2e8e4305d10df738cc4ebcf226077f273a48cbf
| -rw-r--r-- | libc/kernel/arch-mips/asm/signal.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libc/kernel/arch-mips/asm/signal.h b/libc/kernel/arch-mips/asm/signal.h index b51ad71..5f5ac77 100644 --- a/libc/kernel/arch-mips/asm/signal.h +++ b/libc/kernel/arch-mips/asm/signal.h @@ -92,32 +92,33 @@ typedef unsigned long old_sigset_t; #define MINSIGSTKSZ 2048 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define SIGSTKSZ 8192 +struct siginfo; #define SIG_BLOCK 1 #define SIG_UNBLOCK 2 -#define SIG_SETMASK 3 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define SIG_SETMASK 3 #include <asm-generic/signal.h> struct sigaction { unsigned int sa_flags; - union { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + union { __sighandler_t sa_handler; void (*sa_sigaction) (int, struct siginfo *, void *); } __sigaction_handler; -#define sa_handler __sigaction_handler.sa_handler /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define sa_handler __sigaction_handler.sa_handler #define sa_sigaction __sigaction_handler.sa_sigaction sigset_t sa_mask; }; -struct k_sigaction { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct k_sigaction { struct sigaction sa; }; typedef struct sigaltstack { - void *ss_sp; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + void *ss_sp; size_t ss_size; int ss_flags; } stack_t; -#endif /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#endif |