diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
| commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
| tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /include/platform.h | |
| parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
| parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
| download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip | |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'include/platform.h')
| -rw-r--r-- | include/platform.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/platform.h b/include/platform.h index e22c42007..96c603c1f 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -383,7 +383,7 @@ typedef unsigned smalluint; | |||
| 383 | #if defined(__UCLIBC_MAJOR__) | 383 | #if defined(__UCLIBC_MAJOR__) |
| 384 | # if __UCLIBC_MAJOR__ == 0 \ | 384 | # if __UCLIBC_MAJOR__ == 0 \ |
| 385 | && ( __UCLIBC_MINOR__ < 9 \ | 385 | && ( __UCLIBC_MINOR__ < 9 \ |
| 386 | || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 31) \ | 386 | || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ < 32) \ |
| 387 | ) | 387 | ) |
| 388 | # undef HAVE_STRVERSCMP | 388 | # undef HAVE_STRVERSCMP |
| 389 | # endif | 389 | # endif |
| @@ -451,6 +451,8 @@ typedef unsigned smalluint; | |||
| 451 | # undef HAVE_STRVERSCMP | 451 | # undef HAVE_STRVERSCMP |
| 452 | # undef HAVE_XTABS | 452 | # undef HAVE_XTABS |
| 453 | # undef HAVE_DPRINTF | 453 | # undef HAVE_DPRINTF |
| 454 | # undef HAVE_UNLOCKED_STDIO | ||
| 455 | # undef HAVE_UNLOCKED_LINE_OPS | ||
| 454 | #endif | 456 | #endif |
| 455 | 457 | ||
| 456 | #if defined(__FreeBSD__) | 458 | #if defined(__FreeBSD__) |
| @@ -465,7 +467,7 @@ typedef unsigned smalluint; | |||
| 465 | # undef HAVE_STPCPY | 467 | # undef HAVE_STPCPY |
| 466 | #endif | 468 | #endif |
| 467 | 469 | ||
| 468 | #if defined(ANDROID) | 470 | #if defined(ANDROID) || defined(__ANDROID__) |
| 469 | # undef HAVE_DPRINTF | 471 | # undef HAVE_DPRINTF |
| 470 | # undef HAVE_GETLINE | 472 | # undef HAVE_GETLINE |
| 471 | # undef HAVE_STPCPY | 473 | # undef HAVE_STPCPY |