don't use malloc.h.

7 files changed, 97 insertions, 1 deletions

diff --git a/benchmarks/netperf/distinfo b/benchmarks/netperf/distinfo
index 20fe1612957..e8e780ee87b 100644
--- a/benchmarks/netperf/distinfo
+++ b/benchmarks/netperf/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.1 2006/11/21 10:59:25 tron Exp $
+$NetBSD: distinfo,v 1.2 2007/08/08 20:30:13 joerg Exp $
 
 SHA1 (netperf-2.3pl1.tar.gz) = 288c34b6c4d937b06422a8cdab3dcae5ed58cc17
 RMD160 (netperf-2.3pl1.tar.gz) = 83f2afd612b7d4d4b486b82554f4e792c5e8509d
 Size (netperf-2.3pl1.tar.gz) = 836110 bytes
 SHA1 (patch-aa) = f9a835995de2130d4bd74d9c5c6a48bc4c0eb59b
+SHA1 (patch-ab) = a45be8f4f8caf182c053779012e560fa31bcb98b
+SHA1 (patch-ac) = 15714316008fa1362bb8f392f72a6f0125601ce4
+SHA1 (patch-ad) = a829f207d8af01497887b4386d184a4b0d14774f
+SHA1 (patch-ae) = 4848b2699cdbf2b9059f6e0290afc929d94f514c
+SHA1 (patch-af) = 720808dcbdbc6fa1ea55aae43ea1e24c333d9891
+SHA1 (patch-ag) = 4139125768a4b037692ab3cefcb2562ccc5c4b0f
diff --git a/benchmarks/netperf/patches/patch-ab b/benchmarks/netperf/patches/patch-ab
new file mode 100644
index 00000000000..4c149392fe1
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2007/08/08 20:30:13 joerg Exp $
+
+--- nettest_bsd.c.orig	2007-08-08 20:05:44.000000000 +0000
++++ nettest_bsd.c
+@@ -50,11 +50,7 @@ char	nettest_id[]="\
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-#ifdef NOSTDLIBH
+-#include <malloc.h>
+-#else /* NOSTDLIBH */
+ #include <stdlib.h>
+-#endif /* NOSTDLIBH */
+ 
+ #ifndef WIN32
+ #include <sys/time.h>
diff --git a/benchmarks/netperf/patches/patch-ac b/benchmarks/netperf/patches/patch-ac
new file mode 100644
index 00000000000..7be14167b5e
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/08/08 20:30:13 joerg Exp $
+
+--- nettest_dlpi.c.orig	2007-08-08 20:05:40.000000000 +0000
++++ nettest_dlpi.c
+@@ -31,7 +31,7 @@ char	nettest_dlpi_id[]="\
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <sys/stream.h>
+ #include <sys/stropts.h>
+ #include <sys/poll.h>
diff --git a/benchmarks/netperf/patches/patch-ad b/benchmarks/netperf/patches/patch-ad
new file mode 100644
index 00000000000..2fb1773776f
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2007/08/08 20:30:14 joerg Exp $
+
+--- nettest_dns.c.orig	2007-08-08 20:05:37.000000000 +0000
++++ nettest_dns.c
+@@ -41,11 +41,7 @@ char	nettest_dns_id[]="\
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-#ifdef NOSTDLIBH
+-#include <malloc.h>
+-#else /* NOSTDLIBH */
+ #include <stdlib.h>
+-#endif /* NOSTDLIBH */
+ 
+ #ifndef WIN32
+ #include <sys/ipc.h>
diff --git a/benchmarks/netperf/patches/patch-ae b/benchmarks/netperf/patches/patch-ae
new file mode 100644
index 00000000000..37fcf4f4bd5
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2007/08/08 20:30:14 joerg Exp $
+
+--- nettest_ipv6.c.orig	2007-08-08 20:05:35.000000000 +0000
++++ nettest_ipv6.c
+@@ -55,11 +55,7 @@ char	nettest_ipv6_id[]="\
+ #endif /* WIN32 */
+ #include <stdio.h>
+ #include <string.h>
+-#ifdef NOSTDLIBH
+-#include <malloc.h>
+-#else /* NOSTDLIBH */
+ #include <stdlib.h>
+-#endif /* NOSTDLIBH */
+ 
+ #include "netlib.h"
+ #include "netsh.h"
diff --git a/benchmarks/netperf/patches/patch-af b/benchmarks/netperf/patches/patch-af
new file mode 100644
index 00000000000..64a74b49734
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2007/08/08 20:30:14 joerg Exp $
+
+--- nettest_unix.c.orig	2007-08-08 20:05:27.000000000 +0000
++++ nettest_unix.c
+@@ -52,11 +52,6 @@ char	nettest_unix_id[]="\
+ #include <string.h>
+ #include <time.h>
+ #include <sys/time.h>
+-#if ! defined(__bsdi__) && ! defined(_APPLE_)
+-#include <malloc.h>
+-#else
+-#include <sys/malloc.h>
+-#endif
+      
+ #include "netlib.h"
+ #include "netsh.h"
diff --git a/benchmarks/netperf/patches/patch-ag b/benchmarks/netperf/patches/patch-ag
new file mode 100644
index 00000000000..a27f520d052
--- /dev/null
+++ b/benchmarks/netperf/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/08/08 20:30:14 joerg Exp $
+
+--- nettest_xti.c.orig	2007-08-08 20:05:32.000000000 +0000
++++ nettest_xti.c
+@@ -49,7 +49,7 @@ char	nettest_xti_id[]="\
+ #endif /* WIN32 */
+ #include <stdio.h>
+ #include <time.h>
+-#include <malloc.h>
++#include <stdlib.h>
+  /* xti.h should be included *after* in.h because there are name */
+  /* conflicts!( Silly standards people... raj 2/95 fortuenately, the */
+  /* confilcts are on IP_TOP and IP_TTL, whcih netperf does not yet use */