commit 778efe37eed03de6e194a746925f1160181ff587
author Matt Whitlock <busybox@mattwhitlock.name> Sun May 03 18:59:50 2015 +0200
committer Denys Vlasenko <vda.linux@googlemail.com> Sun May 03 19:33:32 2015 +0200
tree d320bacbddf86e7a14cb3c29c194affea4487604
parent f23e3ec529c300712d529fa805d2e1f254bf1884

Conditionalize Bionic workarounds on __ANDROID_API__

Signed-off-by: Matt Whitlock <busybox@mattwhitlock.name>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

include/platform.h

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 @@
 #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