[git commit] Conditionalize Bionic workarounds on __ANDROID_API__

Denys Vlasenko vda.linux at googlemail.com
Sun May 3 17:33:32 UTC 2015


commit: http://git.busybox.net/busybox/commit/?id=778efe37eed03de6e194a746925f1160181ff587
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Matt Whitlock <busybox at mattwhitlock.name>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 include/platform.h |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/platform.h b/include/platform.h
index 8896a6b..1706b18 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -480,10 +480,16 @@ typedef unsigned smalluint;
 #endif
 
 #if defined(ANDROID) || defined(__ANDROID__)
-# undef HAVE_DPRINTF
-# undef HAVE_TTYNAME_R
-# undef HAVE_GETLINE
-# undef HAVE_STPCPY
+# if __ANDROID_API__ < 8
+#  undef HAVE_DPRINTF
+# else
+#  define dprintf fdprintf
+# endif
+# if __ANDROID_API__ < 21
+#  undef HAVE_TTYNAME_R
+#  undef HAVE_GETLINE
+#  undef HAVE_STPCPY
+# endif
 # undef HAVE_MEMPCPY
 # undef HAVE_STRCHRNUL
 # undef HAVE_STRVERSCMP


More information about the busybox-cvs mailing list