diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-12-05 01:30:14 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-12-05 01:30:14 +0100 |
| commit | 8da415ef2503936bc9730f78a25b00177ff2db1d (patch) | |
| tree | a58ed5ab38868fba80ccdea9fe8ee192fa5d9851 | |
| parent | 5dcc6606cb6ef41e0e0b0f828f670cc61311a3f7 (diff) | |
| download | busybox-w32-8da415ef2503936bc9730f78a25b00177ff2db1d.tar.gz busybox-w32-8da415ef2503936bc9730f78a25b00177ff2db1d.tar.bz2 busybox-w32-8da415ef2503936bc9730f78a25b00177ff2db1d.zip | |
add if guards around include <malloc.h>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/appletlib.c | 6 | ||||
| -rw-r--r-- | shell/hush.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index efd7a5a81..3e32fa1ef 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
| @@ -28,7 +28,11 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #include "busybox.h" | 29 | #include "busybox.h" |
| 30 | #include <assert.h> | 30 | #include <assert.h> |
| 31 | #include <malloc.h> | 31 | #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ |
| 32 | || defined(__APPLE__) \ | ||
| 33 | ) | ||
| 34 | # include <malloc.h> /* for mallopt */ | ||
| 35 | #endif | ||
| 32 | /* Try to pull in PAGE_SIZE */ | 36 | /* Try to pull in PAGE_SIZE */ |
| 33 | #ifdef __linux__ | 37 | #ifdef __linux__ |
| 34 | # include <sys/user.h> | 38 | # include <sys/user.h> |
diff --git a/shell/hush.c b/shell/hush.c index 584af9e06..087636b6d 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -82,7 +82,11 @@ | |||
| 82 | * aaa | 82 | * aaa |
| 83 | */ | 83 | */ |
| 84 | #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ | 84 | #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ |
| 85 | #include <malloc.h> /* for malloc_trim */ | 85 | #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ |
| 86 | || defined(__APPLE__) \ | ||
| 87 | ) | ||
| 88 | # include <malloc.h> /* for malloc_trim */ | ||
| 89 | #endif | ||
| 86 | #include <glob.h> | 90 | #include <glob.h> |
| 87 | /* #include <dmalloc.h> */ | 91 | /* #include <dmalloc.h> */ |
| 88 | #if ENABLE_HUSH_CASE | 92 | #if ENABLE_HUSH_CASE |
