diff --git a/ndk/platforms/android-20/arch-arm/include/asm/signal.h b/ndk/platforms/android-20/arch-arm/include/asm/signal.h index 512e22a25..fd39aaa9a 100644 --- a/ndk/platforms/android-20/arch-arm/include/asm/signal.h +++ b/ndk/platforms/android-20/arch-arm/include/asm/signal.h @@ -66,8 +66,8 @@ typedef unsigned long sigset_t; #define SIGSYS 31 #define SIGUNUSED 31 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#define SIGRTMIN 32 -#define SIGRTMAX _KERNEL__NSIG +#define __SIGRTMIN 32 +#define __SIGRTMAX _KERNEL__NSIG #define SIGSWI 32 #define SA_NOCLDSTOP 0x00000001 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/ndk/platforms/android-20/arch-mips/include/asm/signal.h b/ndk/platforms/android-20/arch-mips/include/asm/signal.h index 53f501513..b774a66f3 100644 --- a/ndk/platforms/android-20/arch-mips/include/asm/signal.h +++ b/ndk/platforms/android-20/arch-mips/include/asm/signal.h @@ -71,8 +71,8 @@ typedef unsigned long old_sigset_t; #define SIGXCPU 30 #define SIGXFSZ 31 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#define SIGRTMIN 32 -#define SIGRTMAX _KERNEL__NSIG +#define __SIGRTMIN 32 +#define __SIGRTMAX _KERNEL__NSIG #define SA_ONSTACK 0x08000000 #define SA_RESETHAND 0x80000000 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/ndk/platforms/android-20/arch-x86/include/asm/signal.h b/ndk/platforms/android-20/arch-x86/include/asm/signal.h index 6f5b4354d..308c7a934 100644 --- a/ndk/platforms/android-20/arch-x86/include/asm/signal.h +++ b/ndk/platforms/android-20/arch-x86/include/asm/signal.h @@ -71,8 +71,8 @@ typedef unsigned long sigset_t; #define SIGSYS 31 #define SIGUNUSED 31 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#define SIGRTMIN 32 -#define SIGRTMAX _KERNEL__NSIG +#define __SIGRTMIN 32 +#define __SIGRTMAX _KERNEL__NSIG #define SA_NOCLDSTOP 0x00000001u #define SA_NOCLDWAIT 0x00000002u /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/ndk/platforms/android-20/include/asm-generic/signal.h b/ndk/platforms/android-20/include/asm-generic/signal.h index fe7d9a097..e103240b1 100644 --- a/ndk/platforms/android-20/include/asm-generic/signal.h +++ b/ndk/platforms/android-20/include/asm-generic/signal.h @@ -66,9 +66,9 @@ #define SIGSYS 31 #define SIGUNUSED 31 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ -#define SIGRTMIN 32 -#ifndef SIGRTMAX -#define SIGRTMAX _KERNEL__NSIG +#define __SIGRTMIN 32 +#ifndef __SIGRTMAX +#define __SIGRTMAX _KERNEL__NSIG #endif /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define SA_NOCLDSTOP 0x00000001 diff --git a/ndk/sources/android/libportable/arch-mips/signal.c b/ndk/sources/android/libportable/arch-mips/signal.c index c37f6d260..e84b2fc33 100644 --- a/ndk/sources/android/libportable/arch-mips/signal.c +++ b/ndk/sources/android/libportable/arch-mips/signal.c @@ -32,6 +32,13 @@ #define PORTABLE_TAG "signal_portable" #include +/* 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 #error Bad build environment