From 3fc5b67e1d629f4ff93fbbedee72b32bc56b844d Mon Sep 17 00:00:00 2001
From: danw <danw>
Date: Sun, 23 May 2004 23:28:29 +0000
Subject: malloc.h fixes for darwin, plus a handful of other small fixes for
 problems found after fixing malloc problems

---
 benchmarks/lmbench/distinfo         |  4 ++--
 benchmarks/lmbench/patches/patch-ae | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/lmbench/distinfo b/benchmarks/lmbench/distinfo
index f8c86f0fcb6..6e5d6e78544 100644
--- a/benchmarks/lmbench/distinfo
+++ b/benchmarks/lmbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/04/05 11:11:44 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 23:28:29 danw Exp $
 
 SHA1 (lmbench-2alpha11.tgz) = 7480815b8f8d4000647db59eb6160e9dbac06490
 Size (lmbench-2alpha11.tgz) = 464956 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 0f16f206d56cfdfdd870d21afcef46e3b8e2c53a
 SHA1 (patch-ab) = b25c659fd808535738591892c552b062bb7e7e8f
 SHA1 (patch-ac) = 2aa73fbf3119db95ca483f676bd3f3c2fd25c8f6
 SHA1 (patch-ad) = a196e6a4734de9a0d698d38f1691b1146bda45a2
-SHA1 (patch-ae) = 8784d2911529395e5a13c5dec5a89df5465145e9
+SHA1 (patch-ae) = 9a1475b04bb51f2d36edf8f6cf572235a31c55e0
 SHA1 (patch-af) = 9390d4b6fa950beb0020b44ad520dd22a8a2178e
 SHA1 (patch-ag) = cf5d1f3cf24b9fb6ab4a1a84ad8a44fda858add4
 SHA1 (patch-ah) = ec623c0c22c6f3314aacf965bdd643debca578e0
diff --git a/benchmarks/lmbench/patches/patch-ae b/benchmarks/lmbench/patches/patch-ae
index b4f91ceb59e..33ead658987 100644
--- a/benchmarks/lmbench/patches/patch-ae
+++ b/benchmarks/lmbench/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1 1998/08/30 17:46:26 garbled Exp $
---- src/lmdd.c.orig	Sat Aug 29 13:06:05 1998
-+++ src/lmdd.c	Sat Aug 29 13:17:06 1998
-@@ -797,7 +797,9 @@
+$NetBSD: patch-ae,v 1.2 2004/05/23 23:28:29 danw Exp $
+
+--- src/lmdd.c.orig	Fri Jul 31 15:55:18 1998
++++ src/lmdd.c
+@@ -40,7 +40,6 @@ char	*id = "$Id: lmdd.c,v 1.23 1997/12/0
+ #include	<stdlib.h>
+ #include	<signal.h>
+ #include	<string.h>
+-#include	<malloc.h>
+ #include	<unistd.h>
+ #include	<sys/types.h>
+ #include	<sys/wait.h>
+@@ -797,7 +796,9 @@ getfile(char *s, int ac, char **av)
  				oflags |= (notrunc || append) ? 0 : O_TRUNC;
  				oflags |= nocreate ? 0 : O_CREAT;
  				oflags |= append ? O_APPEND : 0;
-- 
cgit v1.2.3