diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-07 18:25:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 18:25:50 +0100 |
| commit | e222083eee80bec572611f4257315e5ddaefca30 (patch) | |
| tree | baa1325c13ba2ac87f47158f29a91b8e2258f1ec /ACE | |
| parent | f6b983b175a97b3ab8ed2729f2e2bcf54f196b46 (diff) | |
| parent | aeb6cb47d17fd0f39ae09c16ef981eec4b5bc5c1 (diff) | |
| download | ATCD-e222083eee80bec572611f4257315e5ddaefca30.tar.gz | |
Merge pull request #747 from jwillemsen/master
semun is not available on Android with NDK less 12.1b or API level 21…
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/config-android.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index a6adca7b12a..e9f33307df4 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -80,6 +80,8 @@ # define ACE_LACKS_SYS_MSG_H # define ACE_LACKS_SYS_SHM_H # define ACE_LACKS_SYSV_SHMEM +#else +# define ACE_HAS_SEMUN #endif // NDK has telldir() and seekdir() by 15c @@ -88,11 +90,6 @@ # define ACE_LACKS_SEEKDIR #endif -// semun was added to sys/sem.h in r15 -#if ACE_ANDROID_NDK_AT_LEAST(15, 0) || __ANDROID_API__ >= 21 -# define ACE_HAS_SEMUN -#endif - // fd_mask was added in r17c #if ACE_ANDROID_NDK_LESS_THAN(17, 2) # define ACE_LACKS_FD_MASK |