summaryrefslogtreecommitdiff
path: root/ACE/ace/config-android.h
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace/config-android.h')
-rw-r--r--ACE/ace/config-android.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h
index 81318241e7f..8b59463a53f 100644
--- a/ACE/ace/config-android.h
+++ b/ACE/ace/config-android.h
@@ -45,7 +45,12 @@
#define ACE_LACKS_SYS_MSG_H
#define ACE_LACKS_SYS_SHM_H
#define ACE_LACKS_SYS_SYSCTL_H
-#define ACE_LACKS_UCONTEXT_H
+
+#if __ANDROID_API__ < 24
+# define ACE_LACKS_UCONTEXT_H
+#else
+# define ACE_HAS_UCONTEXT_T
+#endif
#define ACE_LACKS_CUSERID
#define ACE_LACKS_FD_MASK
@@ -126,6 +131,8 @@
# define ACE_HAS_ISASTREAM_PROTOTYPE
# define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
# define ACE_HAS_CPU_SET_T
+#elif __ANDROID_API__ >= 24
+# define ACE_HAS_CPU_SET_T
#endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */
// Then the compiler specific parts
@@ -346,10 +353,6 @@
#elif __ANDROID_API__ == 8
# define ACE_LACKS_REGEX_H 1
# define ACE_LACKS_CONDATTR 1
-#elif __ANDROID_API__ == 9
-#elif __ANDROID_API__ == 14
-#else
-# error Unsupported Android release
#endif
#if !defined ACE_DEFAULT_TEMP_DIR
@@ -400,6 +403,10 @@
# undef _B
#endif
+// Disable newer features, result in runtime failures on Android
+#define ACE_LACKS_GETADDRINFO
+#define ACE_LACKS_GETNAMEINFO
+
#include /**/ "ace/post.h"
#endif /* ACE_CONFIG_ANDROID_H */