From 655adf8535c55b2ecc626d2bcdea7d30bc56bdc3 Mon Sep 17 00:00:00 2001
From: keni <keni>
Date: Sun, 10 Jan 2010 02:35:19 +0000
Subject: [PATCH] remove extraneous MAX/MIN extralev.c defines and uses MAX/MIN
 macros instead of max/min from hack.h

---
 src/extralev.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/extralev.c b/src/extralev.c
index c9d9f7272..5e2e96bf6 100644
--- a/src/extralev.c
+++ b/src/extralev.c
@@ -1,5 +1,4 @@
 /* NetHack 3.5	extralev.c	$Date$  $Revision$ */
-/*	SCCS Id: @(#)extralev.c	3.5	2001/09/06	*/
 /*	Copyright 1988, 1989 by Ken Arromdee				*/
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -35,27 +34,21 @@ int x1,y1,x2,y2;
 int horiz;
 {
 	register int x,y,middle;
-#ifndef MAX
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-#endif
-#ifndef MIN
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#endif
 	if (horiz) {
 		middle = x1 + rn2(x2-x1+1);
-		for(x=MIN(x1,middle); x<=MAX(x1,middle); x++)
+		for(x=min(x1,middle); x<=max(x1,middle); x++)
 			corr(x, y1);
-		for(y=MIN(y1,y2); y<=MAX(y1,y2); y++)
+		for(y=min(y1,y2); y<=max(y1,y2); y++)
 			corr(middle,y);
-		for(x=MIN(middle,x2); x<=MAX(middle,x2); x++)
+		for(x=min(middle,x2); x<=max(middle,x2); x++)
 			corr(x, y2);
 	} else {
 		middle = y1 + rn2(y2-y1+1);
-		for(y=MIN(y1,middle); y<=MAX(y1,middle); y++)
+		for(y=min(y1,middle); y<=max(y1,middle); y++)
 			corr(x1, y);
-		for(x=MIN(x1,x2); x<=MAX(x1,x2); x++)
+		for(x=min(x1,x2); x<=max(x1,x2); x++)
 			corr(x, middle);
-		for(y=MIN(middle,y2); y<=MAX(middle,y2); y++)
+		for(y=min(middle,y2); y<=max(middle,y2); y++)
 			corr(x2,y);
 	}
 }