--- deliantra/server/random_maps/room_gen_onion.C	2009/11/06 13:03:34	1.19
+++ deliantra/server/random_maps/room_gen_onion.C	2009/11/07 18:30:05	1.20
@@ -52,10 +52,7 @@
 
 #include <global.h>
 #include <random_map.h>
-
-#ifndef MIN
-# define MIN(x,y) (((x)<(y))? (x):(y))
-#endif
+#include <rproto.h>
 
 static void centered_onion (char **maze, int xsize, int ysize, int option, int layers);
 static void bottom_centered_onion (char **maze, int xsize, int ysize, int option, int layers);
@@ -115,7 +112,7 @@
 {
   int i, maxlayers;
 
-  maxlayers = (MIN (xsize, ysize) - 2) / 5;
+  maxlayers = (min (xsize, ysize) - 2) / 5;
 
   if (!maxlayers)
     return;                     /* map too small to onionize */
@@ -187,7 +184,7 @@
 {
   int i, maxlayers;
 
-  maxlayers = (MIN (xsize, ysize) - 2) / 5;
+  maxlayers = (min (xsize, ysize) - 2) / 5;
 
   if (!maxlayers)
     return;                     /* map too small to onionize */
@@ -415,7 +412,7 @@
 {
   int i, maxlayers;
 
-  maxlayers = (MIN (xsize, ysize) - 2) / 5;
+  maxlayers = (min (xsize, ysize) - 2) / 5;
 
   if (!maxlayers)
     return;                     /* map too small to onionize */