diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-01-02 10:25:11 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-01-02 10:25:11 +0000 |
| commit | b8f278ee745778806118f57fb7884d205eba05ad (patch) | |
| tree | fef237f6dd302c59918cf389a60c120e58d3e086 /include/platform.h | |
| parent | 3fd34651ea72ea1c335d3170f234cb0517fd897f (diff) | |
| parent | 57434022cefde87133b8ad39fb3b79c1274e7684 (diff) | |
| download | busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.tar.gz busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.tar.bz2 busybox-w32-b8f278ee745778806118f57fb7884d205eba05ad.zip | |
Merge branch 'busybox' into merge
Conflicts:
archival/Config.src
shell/ash.c
Diffstat (limited to 'include/platform.h')
| -rw-r--r-- | include/platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/platform.h b/include/platform.h index f18d5b74e..66615b400 100644 --- a/include/platform.h +++ b/include/platform.h | |||
| @@ -469,7 +469,7 @@ typedef unsigned smalluint; | |||
| 469 | # undef HAVE_UNLOCKED_LINE_OPS | 469 | # undef HAVE_UNLOCKED_LINE_OPS |
| 470 | #endif | 470 | #endif |
| 471 | 471 | ||
| 472 | #if defined(__FreeBSD__) | 472 | #if defined(__FreeBSD__) || defined(__APPLE__) |
| 473 | # undef HAVE_STRCHRNUL | 473 | # undef HAVE_STRCHRNUL |
| 474 | #endif | 474 | #endif |
| 475 | 475 | ||