diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-07 15:03:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 15:03:00 +0100 |
| commit | 857dc18761d04c4fa3e88302f5090b0f0e09b108 (patch) | |
| tree | e0261413bf61a14028af7783e49e50d9d2d7f4da | |
| parent | facd75c87956eeb6381dfd03aa9740068e00af8d (diff) | |
| download | ATCD-revert-742-jwi-senum.tar.gz | |
Revert "Android NDK13 does ship a senum type, isn't usable, but ACE shouldn't…"revert-742-jwi-senum
| -rw-r--r-- | ACE/ace/config-android.h | 7 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_sem.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index 14b373017d2..ed5f05a7bd0 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -88,6 +88,13 @@ # define ACE_LACKS_SEEKDIR #endif +// semun was added to sys/sem.h in r15 +#if __ANDROID_API__ >= 21 +# if ACE_ANDROID_NDK_AT_LEAST(15, 0) +# define ACE_HAS_SEMUN +# endif +#endif + // fd_mask was added in r17c #if ACE_ANDROID_NDK_LESS_THAN(17, 2) # define ACE_LACKS_FD_MASK diff --git a/ACE/ace/os_include/sys/os_sem.h b/ACE/ace/os_include/sys/os_sem.h index 334f292897f..91b9b4f1c70 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 */ |