am 116bf16d: am 870c6634: am 557c79bf: am b769dcb8: Merge "Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN"

* commit '116bf16d1f822c264573662031ed9be4ba49a9da':
  Update signal.h from bionic with transition from SIGRTMIN to __SIGRTMIN
This commit is contained in:
Andrew Hsieh
2014-05-09 02:57:34 +00:00
committed by Android Git Automerger
5 changed files with 16 additions and 9 deletions

View File

@@ -66,8 +66,8 @@ typedef unsigned long sigset_t;
#define SIGSYS 31 #define SIGSYS 31
#define SIGUNUSED 31 #define SIGUNUSED 31
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SIGRTMIN 32 #define __SIGRTMIN 32
#define SIGRTMAX _KERNEL__NSIG #define __SIGRTMAX _KERNEL__NSIG
#define SIGSWI 32 #define SIGSWI 32
#define SA_NOCLDSTOP 0x00000001 #define SA_NOCLDSTOP 0x00000001
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

View File

@@ -71,8 +71,8 @@ typedef unsigned long old_sigset_t;
#define SIGXCPU 30 #define SIGXCPU 30
#define SIGXFSZ 31 #define SIGXFSZ 31
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SIGRTMIN 32 #define __SIGRTMIN 32
#define SIGRTMAX _KERNEL__NSIG #define __SIGRTMAX _KERNEL__NSIG
#define SA_ONSTACK 0x08000000 #define SA_ONSTACK 0x08000000
#define SA_RESETHAND 0x80000000 #define SA_RESETHAND 0x80000000
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

View File

@@ -71,8 +71,8 @@ typedef unsigned long sigset_t;
#define SIGSYS 31 #define SIGSYS 31
#define SIGUNUSED 31 #define SIGUNUSED 31
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SIGRTMIN 32 #define __SIGRTMIN 32
#define SIGRTMAX _KERNEL__NSIG #define __SIGRTMAX _KERNEL__NSIG
#define SA_NOCLDSTOP 0x00000001u #define SA_NOCLDSTOP 0x00000001u
#define SA_NOCLDWAIT 0x00000002u #define SA_NOCLDWAIT 0x00000002u
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

View File

@@ -66,9 +66,9 @@
#define SIGSYS 31 #define SIGSYS 31
#define SIGUNUSED 31 #define SIGUNUSED 31
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SIGRTMIN 32 #define __SIGRTMIN 32
#ifndef SIGRTMAX #ifndef __SIGRTMAX
#define SIGRTMAX _KERNEL__NSIG #define __SIGRTMAX _KERNEL__NSIG
#endif #endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define SA_NOCLDSTOP 0x00000001 #define SA_NOCLDSTOP 0x00000001

View File

@@ -32,6 +32,13 @@
#define PORTABLE_TAG "signal_portable" #define PORTABLE_TAG "signal_portable"
#include <log_portable.h> #include <log_portable.h>
/* for build against old platforms when SIGRT* defined instead of __SIGRT* */
#ifndef __SIGRTMIN
#define __SIGRTMIN SIGRTMIN
#endif
#ifndef __SIGRTMAX
#define __SIGRTMAX SIGRTMAX
#endif
#if SIGBUS_PORTABLE == SIGBUS #if SIGBUS_PORTABLE == SIGBUS
#error Bad build environment #error Bad build environment