From f79eb381d510ab3e0c7ca168e17aa47ff1dbcb66 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 22 Jan 2001 13:37:46 +0000
Subject: [PATCH] NDEBUG fixes

---
 iff/iff.c       | 4 +++-
 include/u_mem.h | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/iff/iff.c b/iff/iff.c
index f27f6ee8..656c2dbd 100644
--- a/iff/iff.c
+++ b/iff/iff.c
@@ -12,7 +12,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: iff.c,v 1.2 2001-01-20 13:49:14 bradleyb Exp $";
+static char rcsid[] = "$Id: iff.c,v 1.3 2001-01-22 13:37:46 bradleyb Exp $";
 #endif
 
 #include <conf.h>
@@ -273,7 +273,9 @@ int parse_body(FFILE *ifile,long len,iff_bitmap_header *bmheader)
 	char ignore=0;
 	unsigned char *data_end;
 	int end_pos;
+        #ifndef NDEBUG
 	int row_count=0;
+        #endif
 
         width=0;
         depth=0;
diff --git a/include/u_mem.h b/include/u_mem.h
index 8fe1606c..61c683c4 100644
--- a/include/u_mem.h
+++ b/include/u_mem.h
@@ -11,6 +11,8 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
 COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
  
+#include <stdlib.h>
+
 #ifdef MACINTOSH
 extern ubyte virtual_memory_on;
 #endif
@@ -35,10 +37,9 @@ void mem_validate_heap();
 
 #else
 
-#define free(ptr)       do{ free(ptr); ptr=NULL; } while(0)
+#define d_malloc(size)    malloc(size)
+#define d_free(ptr)       do{ free(ptr); ptr=NULL; } while(0)
 
 #define MALLOC( var, type, count )   (var=(type *)malloc((count)*sizeof(type)))
 
 #endif
-
-
-- 
2.39.2