[GRASS-SVN] r57277 - in grass-addons/grass7/raster/r.fuzzy: r.fuzzy.logic r.fuzzy.system

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-07-26 01:01:02 -0700 (Fri, 26 Jul 2013)
New Revision: 57277

Modified:
   grass-addons/grass7/raster/r.fuzzy/r.fuzzy.logic/local_proto.h
   grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h
Log:
r.fuzzy: fix MIN/MAX definition

Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.logic/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.logic/local_proto.h	2013-07-25 19:40:23 UTC (rev 57276)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.logic/local_proto.h	2013-07-26 08:01:02 UTC (rev 57277)
@@ -18,10 +18,11 @@
 #define FODOR			5
 #define HAMACHER		6
 
+#undef MIN
+#undef MAX
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
 
-
 float f_and(float cellx, float celly, int family);
 float f_or(float cellx, float celly, int family);
 float f_imp(float cellx, float celly, int family);

Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h	2013-07-25 19:40:23 UTC (rev 57276)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h	2013-07-26 08:01:02 UTC (rev 57277)
@@ -21,10 +21,11 @@
 #define STACKMAX 200
 #define VARMAX 31
 
+#undef MIN
+#undef MAX
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
 
-
 typedef char *STRING;
 
 typedef enum