diff options
| author | Adam Mitz <mitza@ociweb.com> | 2016-09-26 16:54:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 16:54:52 -0500 |
| commit | 01603b83ed00bdbc86f01c0d0d178048dcfc5318 (patch) | |
| tree | af8de3dddb6558bee9da5fa013bf7946fba73ed2 | |
| parent | ff14fd0b2562642866130b3e1b6ccbbd318365f0 (diff) | |
| parent | 65a6d0bb86e9df6fd323f646a512b9527ec73cb4 (diff) | |
| download | ATCD-01603b83ed00bdbc86f01c0d0d178048dcfc5318.tar.gz | |
Merge pull request #303 from mitza-oci/master
Support for Android NDK r12b (Platform API 24)
| -rw-r--r-- | ACE/ace/config-android.h | 13 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_sched.h | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index 6ef35e95fe2..8b59463a53f 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -45,7 +45,12 @@ #define ACE_LACKS_SYS_MSG_H #define ACE_LACKS_SYS_SHM_H #define ACE_LACKS_SYS_SYSCTL_H -#define ACE_LACKS_UCONTEXT_H + +#if __ANDROID_API__ < 24 +# define ACE_LACKS_UCONTEXT_H +#else +# define ACE_HAS_UCONTEXT_T +#endif #define ACE_LACKS_CUSERID #define ACE_LACKS_FD_MASK @@ -126,6 +131,8 @@ # define ACE_HAS_ISASTREAM_PROTOTYPE # define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE # define ACE_HAS_CPU_SET_T +#elif __ANDROID_API__ >= 24 +# define ACE_HAS_CPU_SET_T #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */ // Then the compiler specific parts @@ -346,10 +353,6 @@ #elif __ANDROID_API__ == 8 # define ACE_LACKS_REGEX_H 1 # define ACE_LACKS_CONDATTR 1 -#elif __ANDROID_API__ == 9 -#elif __ANDROID_API__ == 14 -#else -# error Unsupported Android release #endif #if !defined ACE_DEFAULT_TEMP_DIR diff --git a/ACE/ace/os_include/os_sched.h b/ACE/ace/os_include/os_sched.h index c69b75315a3..7880bd3f190 100644 --- a/ACE/ace/os_include/os_sched.h +++ b/ACE/ace/os_include/os_sched.h @@ -37,7 +37,7 @@ extern "C" #if !defined (__cpu_set_t_defined) || !defined (ACE_HAS_CPU_SET_T) #if defined (ACE_HAS_CPUSET_T) typedef cpuset_t cpu_set_t; -#else +#elif !defined (ACE_HAS_CPU_SET_T) # define ACE_CPU_SETSIZE 1024 typedef struct { |