diff options
| author | Chris Renshaw | 2015-12-17 16:42:01 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2015-12-17 16:42:41 +0100 |
| commit | 6df961257d584714c5690b1f4197c677e4f832ec (patch) | |
| tree | ff33f9a5fb3f68338dd4e737cbd4b8bd4546aae9 | |
| parent | e0942acb9e186cbfc16afe704e10a8af9cd1cc58 (diff) | |
| download | busybox-6df961257d584714c5690b1f4197c677e4f832ec.zip busybox-6df961257d584714c5690b1f4197c677e4f832ec.tar.gz | |
Resolve linker issues with Android API 21 (dprintf, tcdrain)
Signed-off-by: Chris Renshaw <osm0sis@outlook.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/platform.h | 7 | ||||
| -rw-r--r-- | libbb/missing_syscalls.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/platform.h b/include/platform.h index 1706b18..026ebbe 100644 --- a/include/platform.h +++ b/include/platform.h @@ -481,9 +481,14 @@ typedef unsigned smalluint; #if defined(ANDROID) || defined(__ANDROID__) # if __ANDROID_API__ < 8 + /* ANDROID < 8 has no [f]dprintf at all */ # undef HAVE_DPRINTF -# else +# elif __ANDROID_API__ < 21 + /* ANDROID < 21 has fdprintf */ # define dprintf fdprintf +# else + /* ANDROID >= 21 has standard dprintf */ +# endif # endif # if __ANDROID_API__ < 21 # undef HAVE_TTYNAME_R diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c index e3c1e92..0934128 100644 --- a/libbb/missing_syscalls.c +++ b/libbb/missing_syscalls.c @@ -40,8 +40,10 @@ int pivot_root(const char *new_root, const char *put_old) return syscall(__NR_pivot_root, new_root, put_old); } +# if __ANDROID_API__ < 21 int tcdrain(int fd) { return ioctl(fd, TCSBRK, 1); } +# endif #endif |