diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-07 12:56:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 12:56:41 +0100 |
| commit | d57cce34b9c589b46be7a84a776bcea6c89a843b (patch) | |
| tree | e0261413bf61a14028af7783e49e50d9d2d7f4da | |
| parent | 618533091124a97d6dcd4b106e38cb5ca2477b98 (diff) | |
| parent | 1f110c0861392f44ff76335cd3a7ac64d9c4fdb3 (diff) | |
| download | ATCD-d57cce34b9c589b46be7a84a776bcea6c89a843b.tar.gz | |
Merge pull request #741 from jwillemsen/jwi-travisci-nosudo
Only define ACE_HAS_SEMUN when we have API >= 12 and at least NDK 15
| -rw-r--r-- | ACE/ace/config-android.h | 7 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_android.GNU | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index 4a4ec25c7b8..ed5f05a7bd0 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -90,11 +90,8 @@ // semun was added to sys/sem.h in r15 #if __ANDROID_API__ >= 21 -# define ACE_HAS_SEMUN -# if ACE_ANDROID_NDK_LESS_THAN(15, 0) -# error \ -This combination of Android NDK < r15 and API >= 21 is not supported. \ -There are conflicting versions of semun between ACE and linux/sem.h. +# if ACE_ANDROID_NDK_AT_LEAST(15, 0) +# define ACE_HAS_SEMUN # endif #endif diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU index 813d56ba29b..b9f7c7f611a 100644 --- a/ACE/include/makeinclude/platform_android.GNU +++ b/ACE/include/makeinclude/platform_android.GNU @@ -22,7 +22,7 @@ PIE ?= -pie #No rwho on Android rwho = 0 -# Android Studio does not seem to reconize so files with versions +# Android Studio does not seem to recognize so files with versions versioned_so=0 # Only try to use clang, unless this is set to 0, then try to use g++ |