8da415ef2
Denys Vlasenko
2010-12-05
Subject
add if guards around include
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/appletlib.c+5 -1
| @@ -28,7 +28,11 @@ | |
| */ | |
| #include "busybox.h" | |
| #include <assert.h> | |
| - | #include <malloc.h> |
| + | #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ |
| + | || defined(__APPLE__) \ |
| + | ) |
| + | # include <malloc.h> /* for mallopt */ |
| + | #endif |
| /* Try to pull in PAGE_SIZE */ | |
| #ifdef __linux__ | |
| # include <sys/user.h> | |
shell/hush.c+5 -1
| @@ -82,7 +82,11 @@ | |
| * aaa | |
| */ | |
| #include "busybox.h" /* for APPLET_IS_NOFORK/NOEXEC */ | |
| - | #include <malloc.h> /* for malloc_trim */ |
| + | #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ |
| + | || defined(__APPLE__) \ |
| + | ) |
| + | # include <malloc.h> /* for malloc_trim */ |
| + | #endif |
| #include <glob.h> | |
| /* #include <dmalloc.h> */ | |
| #if ENABLE_HUSH_CASE | |