diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-01-07 14:09:47 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-01-07 14:09:47 +0100 |
| commit | 432fbd7a1a71ab5a91a8cfab57fad74fda9389bb (patch) | |
| tree | e844afd8300ad200cbc2c29fc2a5f049542fe3a3 | |
| parent | 57434022cefde87133b8ad39fb3b79c1274e7684 (diff) | |
| download | busybox-w32-432fbd7a1a71ab5a91a8cfab57fad74fda9389bb.tar.gz busybox-w32-432fbd7a1a71ab5a91a8cfab57fad74fda9389bb.tar.bz2 busybox-w32-432fbd7a1a71ab5a91a8cfab57fad74fda9389bb.zip | |
platform.h: undef HAVE_STRCHRNUL only on correct versions of FreeBSD
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/platform.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/include/platform.h b/include/platform.h index cfc802907..2899a9093 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -385,10 +385,6 @@ typedef unsigned smalluint; | |||
| 385 | # undef HAVE_STRVERSCMP | 385 | # undef HAVE_STRVERSCMP |
| 386 | #endif | 386 | #endif |
| 387 | 387 | ||
| 388 | #if defined(__dietlibc__) | ||
| 389 | # undef HAVE_STRCHRNUL | ||
| 390 | #endif | ||
| 391 | |||
| 392 | #if defined(__WATCOMC__) | 388 | #if defined(__WATCOMC__) |
| 393 | # undef HAVE_DPRINTF | 389 | # undef HAVE_DPRINTF |
| 394 | # undef HAVE_GETLINE | 390 | # undef HAVE_GETLINE |
| @@ -434,10 +430,21 @@ typedef unsigned smalluint; | |||
| 434 | # undef HAVE_UNLOCKED_LINE_OPS | 430 | # undef HAVE_UNLOCKED_LINE_OPS |
| 435 | #endif | 431 | #endif |
| 436 | 432 | ||
| 437 | #if defined(__FreeBSD__) || defined(__APPLE__) | 433 | #if defined(__dietlibc__) |
| 438 | # undef HAVE_STRCHRNUL | 434 | # undef HAVE_STRCHRNUL |
| 439 | #endif | 435 | #endif |
| 440 | 436 | ||
| 437 | #if defined(__APPLE__) | ||
| 438 | # undef HAVE_STRCHRNUL | ||
| 439 | #endif | ||
| 440 | |||
| 441 | #if defined(__FreeBSD__) | ||
| 442 | # include <sys/param.h> | ||
| 443 | # if __FreeBSD_version < 1000029 | ||
| 444 | # undef HAVE_STRCHRNUL | ||
| 445 | # endif | ||
| 446 | #endif | ||
| 447 | |||
| 441 | #if defined(__NetBSD__) | 448 | #if defined(__NetBSD__) |
| 442 | # define HAVE_GETLINE 1 /* Recent NetBSD versions have getline() */ | 449 | # define HAVE_GETLINE 1 /* Recent NetBSD versions have getline() */ |
| 443 | #endif | 450 | #endif |