am 56849da6: Merge "[MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain"

* commit '56849da62cb54b9ea105895b2d65e5f40328fa41':
  [MIPS] Import signal.h from bionic. This version fixes the warning emitted by the toolchain
This commit is contained in:
Andrew Hsieh
2012-05-02 20:06:03 -07:00
committed by Android Git Automerger

View File

@@ -92,32 +92,33 @@ typedef unsigned long old_sigset_t;
#define MINSIGSTKSZ 2048 #define MINSIGSTKSZ 2048
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SIGSTKSZ 8192 #define SIGSTKSZ 8192
struct siginfo;
#define SIG_BLOCK 1 #define SIG_BLOCK 1
#define SIG_UNBLOCK 2 #define SIG_UNBLOCK 2
#define SIG_SETMASK 3
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SIG_SETMASK 3
#include <asm-generic/signal.h> #include <asm-generic/signal.h>
struct sigaction { struct sigaction {
unsigned int sa_flags; unsigned int sa_flags;
union {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
union {
__sighandler_t sa_handler; __sighandler_t sa_handler;
void (*sa_sigaction) (int, struct siginfo *, void *); void (*sa_sigaction) (int, struct siginfo *, void *);
} __sigaction_handler; } __sigaction_handler;
#define sa_handler __sigaction_handler.sa_handler
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* 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 #define sa_sigaction __sigaction_handler.sa_sigaction
sigset_t sa_mask; sigset_t sa_mask;
}; };
struct k_sigaction {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct k_sigaction {
struct sigaction sa; struct sigaction sa;
}; };
typedef struct sigaltstack { typedef struct sigaltstack {
void *ss_sp;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
void *ss_sp;
size_t ss_size; size_t ss_size;
int ss_flags; int ss_flags;
} stack_t; } stack_t;
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif