[GRASS-SVN] r71008 - in grass-addons/grass7/raster: r.le.patch r.le.pixel r.le.trace

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2017-05-02 19:40:22 -0700 (Tue, 02 May 2017)
New Revision: 71008

Modified:
   grass-addons/grass7/raster/r.le.patch/driver.c
   grass-addons/grass7/raster/r.le.patch/patch.h
   grass-addons/grass7/raster/r.le.pixel/pixel.h
   grass-addons/grass7/raster/r.le.trace/r.le.trace.h
Log:
r.le.*: fix trivial compilation issues (more serious remain)

Modified: grass-addons/grass7/raster/r.le.patch/driver.c
===================================================================
--- grass-addons/grass7/raster/r.le.patch/driver.c	2017-05-03 02:27:11 UTC (rev 71007)
+++ grass-addons/grass7/raster/r.le.patch/driver.c	2017-05-03 02:40:22 UTC (rev 71008)
@@ -18,12 +18,13 @@
  *                                                         *
  ************************************************************/
 
+#include "patch.h"
+
 #include <grass/gis.h>
 #include <grass/config.h>
-#include "patch.h"
+#include <grass/raster.h>
 
 
-
 /* DEFINE GLOBAL VARIABLES */
 
 int ntype = 0, finput, n_scale = 1, n_unit = 1, size_cl_no = 0, *recl_count,

Modified: grass-addons/grass7/raster/r.le.patch/patch.h
===================================================================
--- grass-addons/grass7/raster/r.le.patch/patch.h	2017-05-03 02:27:11 UTC (rev 71007)
+++ grass-addons/grass7/raster/r.le.patch/patch.h	2017-05-03 02:40:22 UTC (rev 71008)
@@ -34,6 +34,8 @@
 #include <grass/gis.h>
 
 #define  SML   0.5
+// undefine library's MIN macro
+#undef MIN
 #define  MIN   2
 #define  EQ(a, b)    (a-b < 0.01 && a-b > -0.01 )
 #define  BIG   1000000000.0

Modified: grass-addons/grass7/raster/r.le.pixel/pixel.h
===================================================================
--- grass-addons/grass7/raster/r.le.pixel/pixel.h	2017-05-03 02:27:11 UTC (rev 71007)
+++ grass-addons/grass7/raster/r.le.pixel/pixel.h	2017-05-03 02:40:22 UTC (rev 71008)
@@ -28,6 +28,8 @@
 #include <grass/gis.h>
 
 #define  BIG   1000000000.0
+// undefine library's macro
+#undef MAX
 #define  MAX   800
 
 typedef struct __dirdesc

Modified: grass-addons/grass7/raster/r.le.trace/r.le.trace.h
===================================================================
--- grass-addons/grass7/raster/r.le.trace/r.le.trace.h	2017-05-03 02:27:11 UTC (rev 71007)
+++ grass-addons/grass7/raster/r.le.trace/r.le.trace.h	2017-05-03 02:40:22 UTC (rev 71008)
@@ -29,6 +29,8 @@
 
 #define EQ(a, b)    (a-b < 0.01 && a-b > -0.01 )
 #define BIG   500000000.0
+// undefine library's macro
+#undef MIN
 #define MIN   5
 #define NULLPTR (PATCH *) 0