[GRASS-SVN] r32932 - grass/trunk/raster/r.external

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-08-20 15:28:40 -0400 (Wed, 20 Aug 2008)
New Revision: 32932

Modified:
   grass/trunk/raster/r.external/main.c
Log:
Fix definitions of MIN,MAX; don't use external versions


Modified: grass/trunk/raster/r.external/main.c
===================================================================
--- grass/trunk/raster/r.external/main.c	2008-08-20 19:24:35 UTC (rev 32931)
+++ grass/trunk/raster/r.external/main.c	2008-08-20 19:28:40 UTC (rev 32932)
@@ -27,12 +27,10 @@
 #include "gdal.h"
 #include "ogr_srs_api.h"
 
-#ifndef MIN
-#  define MIN(a,b)      ((a<b) ? a : b)
-#endif
-#ifndef MAX
-#  define MAX(a,b)      ((a>b) ? a : b)
-#endif
+#undef MIN
+#undef MAX
+#define MIN(a,b)      ((a) < (b) ? (a) : (b))
+#define MAX(a,b)      ((a) > (b) ? (a) : (b))
 
 struct band_info
 {