[GRASS-SVN] r32936 - grass/branches/develbranch_6/raster/r.in.gdal

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-08-20 16:13:36 -0400 (Wed, 20 Aug 2008)
New Revision: 32936

Modified:
   grass/branches/develbranch_6/raster/r.in.gdal/main.c
Log:
glynn: Fix definitions of MIN,MAX; don't use external versions (merge from trunk, r32933)

Modified: grass/branches/develbranch_6/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.gdal/main.c	2008-08-20 19:38:16 UTC (rev 32935)
+++ grass/branches/develbranch_6/raster/r.in.gdal/main.c	2008-08-20 20:13:36 UTC (rev 32936)
@@ -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);