[GRASS-SVN] r32933 - grass/trunk/raster/r.in.gdal

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-08-20 15:30:57 -0400 (Wed, 20 Aug 2008)
New Revision: 32933

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


Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c	2008-08-20 19:28:40 UTC (rev 32932)
+++ grass/trunk/raster/r.in.gdal/main.c	2008-08-20 19:30:57 UTC (rev 32933)
@@ -29,10 +29,10 @@
 #include "gdal.h"
 #include "ogr_srs_api.h"
 
-#ifndef MAX
-#  define MIN(a,b)      ((a<b) ? a : b)
-#  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))
 
 static void ImportBand(GDALRasterBandH hBand, const char *output,
 		       struct Ref *group_ref);