diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-07 14:51:14 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-07 14:51:14 +0100 |
| commit | 901f33ca78dc15ff64922e42a401ee18c074a4c3 (patch) | |
| tree | 3f4f62cd4c014e2624e0b0657e4b125d73b36db9 | |
| parent | d57cce34b9c589b46be7a84a776bcea6c89a843b (diff) | |
| download | ATCD-901f33ca78dc15ff64922e42a401ee18c074a4c3.tar.gz | |
Android NDK13 does ship a senum type, isn't usable, but ACE shouldn't define its own version
* ACE/ace/config-android.h:
* ACE/ace/os_include/sys/os_sem.h:
| -rw-r--r-- | ACE/ace/config-android.h | 5 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_sem.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index ed5f05a7bd0..0394f37e547 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -88,9 +88,10 @@ # define ACE_LACKS_SEEKDIR #endif -// semun was added to sys/sem.h in r15 +// semun was added to sys/sem.h in r15 but in r13 it does +// exist as type but isn't usable #if __ANDROID_API__ >= 21 -# if ACE_ANDROID_NDK_AT_LEAST(15, 0) +# if ACE_ANDROID_NDK_AT_LEAST(13, 0) # define ACE_HAS_SEMUN # endif #endif diff --git a/ACE/ace/os_include/sys/os_sem.h b/ACE/ace/os_include/sys/os_sem.h index 91b9b4f1c70..334f292897f 100644 --- a/ACE/ace/os_include/sys/os_sem.h +++ b/ACE/ace/os_include/sys/os_sem.h @@ -29,7 +29,7 @@ # include /**/ <sys/sem.h> #else # ifdef ACE_HAS_LINUX_SEM_H -# include <linux/sem.h> +# include /**/ <linux/sem.h> # endif #endif /* !ACE_LACKS_SYS_SEM_H */ |