From 857dc18761d04c4fa3e88302f5090b0f0e09b108 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 7 Nov 2018 15:03:00 +0100 Subject: =?UTF-8?q?Revert=20"Android=20NDK13=20does=20ship=20a=20senum=20t?= =?UTF-8?q?ype,=20isn't=20usable,=20but=20ACE=20shouldn't=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ACE/ace/config-android.h | 7 +++++++ ACE/ace/os_include/sys/os_sem.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 /**/ #else # ifdef ACE_HAS_LINUX_SEM_H -# include /**/ +# include # endif #endif /* !ACE_LACKS_SYS_SEM_H */ -- cgit v1.2.1