diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-11-07 14:57:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 14:57:34 +0100 |
| commit | facd75c87956eeb6381dfd03aa9740068e00af8d (patch) | |
| tree | 72bfeda50b10d33cb6db97efeb9008d2cbf01b89 | |
| parent | d57cce34b9c589b46be7a84a776bcea6c89a843b (diff) | |
| parent | 950dd74dd9ac2379c6b4ec1365738d6393313ce1 (diff) | |
| download | ATCD-facd75c87956eeb6381dfd03aa9740068e00af8d.tar.gz | |
Merge pull request #742 from jwillemsen/jwi-senum
Android NDK13 does ship a senum type, isn't usable, but ACE shouldn't…
| -rw-r--r-- | ACE/ace/config-android.h | 7 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_sem.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index ed5f05a7bd0..14b373017d2 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -88,13 +88,6 @@ # 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 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 */ |