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

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-07-26 01:03:15 -0700 (Fri, 26 Jul 2013)
New Revision: 57278

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

Modified: grass-addons/grass6/raster/r.fuzzy.logic/local_proto.h
===================================================================
--- grass-addons/grass6/raster/r.fuzzy.logic/local_proto.h	2013-07-26 08:01:02 UTC (rev 57277)
+++ grass-addons/grass6/raster/r.fuzzy.logic/local_proto.h	2013-07-26 08:03:15 UTC (rev 57278)
@@ -17,10 +17,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/grass6/raster/r.fuzzy.system/local_proto.h
===================================================================
--- grass-addons/grass6/raster/r.fuzzy.system/local_proto.h	2013-07-26 08:01:02 UTC (rev 57277)
+++ grass-addons/grass6/raster/r.fuzzy.system/local_proto.h	2013-07-26 08:03:15 UTC (rev 57278)
@@ -20,10 +20,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