From e010cb3c62f837cca8b8139d4ef3125c49706085 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Tue, 29 Mar 2005 20:45:38 +0000
Subject: [PATCH] remove obsolete malloc.h

---
 ChangeLog | 4 ++++
 mem/mem.c | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f83b9e17..d788056a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-29  Bradley Bell  <btb@icculus.org>
+
+	* mem/mem.c: remove obsolete malloc.h
+
 2005-03-20  Bradley Bell  <btb@icculus.org>
 
 	* Makefile.am: add some stuff to dist
diff --git a/mem/mem.c b/mem/mem.c
index 884db4e9..b2541981 100644
--- a/mem/mem.c
+++ b/mem/mem.c
@@ -1,4 +1,4 @@
-/* $Id: mem.c,v 1.14 2004-08-01 16:28:33 schaffner Exp $ */
+/* $Id: mem.c,v 1.15 2005-03-29 20:45:38 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -34,13 +34,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(__APPLE__) && defined(__MACH__)
-#include <sys/malloc.h>
-#elif defined(macintosh)
-#include <stdlib.h>
-#else
+#if 0 // deprecated
 #include <malloc.h>
 #endif
+
 #include "pstypes.h"
 #include "mono.h"
 #include "error.h"
-- 
2.39.2