From 239d00e91997cb138f363dfd6cb03d298cfd5014 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Mar 2011 15:08:26 +0100
Subject: fix compile on Darwin

---
 tools/cpio/src/cpio.c     | 1 -
 tools/cpio/src/ib_alloc.c | 1 -
 tools/cpio/src/sigset.c   | 2 +-
 tools/cpio/src/sigset.h   | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'tools/cpio/src')

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__)
-- 
cgit v1.2.3