[GRASS-SVN] r58816 - in grass-addons/grass7/raster: r.convergence r.geomorphon

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-01-30 16:09:39 -0800 (Thu, 30 Jan 2014)
New Revision: 58816

Modified:
   grass-addons/grass7/raster/r.convergence/local_proto.h
   grass-addons/grass7/raster/r.geomorphon/local_proto.h
Log:
addons: undefine MIN and MAX before redefining (as in r.in.gdal)

Modified: grass-addons/grass7/raster/r.convergence/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.convergence/local_proto.h	2014-01-30 23:08:54 UTC (rev 58815)
+++ grass-addons/grass7/raster/r.convergence/local_proto.h	2014-01-31 00:09:39 UTC (rev 58816)
@@ -37,6 +37,8 @@
 #endif
 
 
+#undef MIN
+#undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define DEGREE2RAD(a) ((a)/(180/PI))

Modified: grass-addons/grass7/raster/r.geomorphon/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.geomorphon/local_proto.h	2014-01-30 23:08:54 UTC (rev 58815)
+++ grass-addons/grass7/raster/r.geomorphon/local_proto.h	2014-01-31 00:09:39 UTC (rev 58816)
@@ -48,7 +48,8 @@
 #define DEGREE2RAD(a) ((a)/(180/PI))
 #define RAD2DEGREE(a) ((a)*(180/PI))
 
-
+#undef MIN
+#undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))