From 5e5cea24ee604acee4d72cfffef50a61b59c92c8 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Wed, 1 Dec 2004 06:57:28 +0000
Subject: [PATCH] Get rid of MIN redefinition.

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

diff --git a/ChangeLog b/ChangeLog
index 7746c727..a02ff1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	more convenient.  Turn debugging on.  Don't compile old files,
 	compile new ones.  Add the PhysicsFS library.
 
+	* iff/iff.c: Get rid of MIN redefinition.
+
 2004-11-30  Bradley Bell  <btb@icculus.org>
 
 	* .cvsignore, 2d/.cvsignore, 3d/.cvsignore, arch/.cvsignore,
diff --git a/iff/iff.c b/iff/iff.c
index 3bd4a5ae..90905023 100644
--- a/iff/iff.c
+++ b/iff/iff.c
@@ -1,4 +1,4 @@
-/* $Id: iff.c,v 1.9 2004-08-28 23:17:45 schaffner Exp $ */
+/* $Id: iff.c,v 1.10 2004-12-01 06:57:28 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: iff.c,v 1.9 2004-08-28 23:17:45 schaffner Exp $";
+static char rcsid[] = "$Id: iff.c,v 1.10 2004-12-01 06:57:28 btb Exp $";
 #endif
 
 #define COMPRESS		1	//do the RLE or not? (for debugging mostly)
@@ -86,8 +86,6 @@ typedef struct fake_file {
 	int length;
 } FFILE;
 
-#define MIN(a,b) ((a<b)?a:b)
-
 #define MAKE_SIG(a,b,c,d) (((long)(a)<<24)+((long)(b)<<16)+((c)<<8)+(d))
 
 #define form_sig MAKE_SIG('F','O','R','M')
-- 
2.39.2