summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Whitlock <busybox@mattwhitlock.name>2015-05-03 16:59:50 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2015-05-03 17:33:32 (GMT)
commit778efe37eed03de6e194a746925f1160181ff587 (patch)
treed320bacbddf86e7a14cb3c29c194affea4487604
parentf23e3ec529c300712d529fa805d2e1f254bf1884 (diff)
downloadbusybox-refs/heads/master.tar.gz
busybox-refs/heads/master.tar.bz2
Conditionalize Bionic workarounds on __ANDROID_API__HEADmaster
Signed-off-by: Matt Whitlock <busybox@mattwhitlock.name> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/platform.h14
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