diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-02-22 10:00:45 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-02-22 10:00:45 +0000 |
| commit | 371c20c008254a36e7157df6c13dc2e4cf87d6fd (patch) | |
| tree | a214c03f6617dffa60df2192b312a46c93b7c19f /include/platform.h | |
| parent | ab879a41ab674129ef1593cda181cc8b64d0dadf (diff) | |
| parent | 3a5cc989025eefe03fda0552b253a4a8f015a761 (diff) | |
| download | busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.tar.gz busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.tar.bz2 busybox-w32-371c20c008254a36e7157df6c13dc2e4cf87d6fd.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'include/platform.h')
| -rw-r--r-- | include/platform.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/platform.h b/include/platform.h index 1cbffc102..94368539e 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -517,9 +517,13 @@ typedef unsigned smalluint; | |||
| 517 | 517 | ||
| 518 | #if defined(ANDROID) || defined(__ANDROID__) | 518 | #if defined(ANDROID) || defined(__ANDROID__) |
| 519 | # if __ANDROID_API__ < 8 | 519 | # if __ANDROID_API__ < 8 |
| 520 | /* ANDROID < 8 has no [f]dprintf at all */ | ||
| 520 | # undef HAVE_DPRINTF | 521 | # undef HAVE_DPRINTF |
| 521 | # else | 522 | # elif __ANDROID_API__ < 21 |
| 523 | /* ANDROID < 21 has fdprintf */ | ||
| 522 | # define dprintf fdprintf | 524 | # define dprintf fdprintf |
| 525 | # else | ||
| 526 | /* ANDROID >= 21 has standard dprintf */ | ||
| 523 | # endif | 527 | # endif |
| 524 | # if __ANDROID_API__ < 21 | 528 | # if __ANDROID_API__ < 21 |
| 525 | # undef HAVE_TTYNAME_R | 529 | # undef HAVE_TTYNAME_R |