summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-03-21 15:08:26 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-03-21 15:08:26 +0100
commit239d00e91997cb138f363dfd6cb03d298cfd5014 (patch)
treede9b0addbcafd44265e44b6da1ee719f2a8a382b /tools
parent7278363695470d253dd8d428699914ced5861f20 (diff)
fix compile on Darwin
Diffstat (limited to 'tools')
-rw-r--r--tools/cpio/src/cpio.c1
-rw-r--r--tools/cpio/src/ib_alloc.c1
-rw-r--r--tools/cpio/src/sigset.c2
-rw-r--r--tools/cpio/src/sigset.h2
4 files changed, 2 insertions, 4 deletions
diff --git a/tools/cpio/src/cpio.c b/tools/cpio/src/cpio.c
index 9b3c6eee6..8e81a9819 100644
--- a/tools/cpio/src/cpio.c
+++ b/tools/cpio/src/cpio.c
@@ -49,7 +49,6 @@
#include <sys/wait.h>
#include <fcntl.h>
#include <stdlib.h>
-#include <malloc.h>
#include <string.h>
#include <unistd.h>
#include <signal.h>
diff --git a/tools/cpio/src/ib_alloc.c b/tools/cpio/src/ib_alloc.c
index 338d0622b..4020940ce 100644
--- a/tools/cpio/src/ib_alloc.c
+++ b/tools/cpio/src/ib_alloc.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
-#include <malloc.h>
#include "memalign.h"
#include "iblok.h"
diff --git a/tools/cpio/src/sigset.c b/tools/cpio/src/sigset.c
index 222ae7d9f..d561d541d 100644
--- a/tools/cpio/src/sigset.c
+++ b/tools/cpio/src/sigset.c
@@ -21,7 +21,7 @@
*/
/* Sccsid @(#)sigset.c 1.7 (gritter) 1/22/06 */
-#include <features.h>
+#include <sys/param.h>
#if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \
defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || \
defined (__UCLIBC__)
diff --git a/tools/cpio/src/sigset.h b/tools/cpio/src/sigset.h
index 52fd8cd6a..ada73a884 100644
--- a/tools/cpio/src/sigset.h
+++ b/tools/cpio/src/sigset.h
@@ -21,7 +21,7 @@
*/
/* Sccsid @(#)sigset.h 1.9 (gritter) 1/22/06 */
-#include <features.h>
+#include <sys/param.h>
#if defined (__FreeBSD__) || defined (__dietlibc__) || defined (__NetBSD__) || \
defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) || \
defined (__UCLIBC__)