[prev in list] [next in list] [prev in thread] [next in thread] 

List:       grass-commit
Subject:    [GRASS-SVN] r69615 - grass/trunk/display/d.linegraph
From:       svn_grass () osgeo ! org
Date:       2016-09-30 21:35:10
Message-ID: 20160930213510.B1E2E390334 () trac ! osgeo ! org
[Download RAW message or body]

Author: wenzeslaus
Date: 2016-09-30 14:35:10 -0700 (Fri, 30 Sep 2016)
New Revision: 69615

Modified:
   grass/trunk/display/d.linegraph/main.c
Log:
d.linegraph: define MIN/MAX macros only when needed (assuming that def like sys/param.h are what we want)

Modified: grass/trunk/display/d.linegraph/main.c
===================================================================
--- grass/trunk/display/d.linegraph/main.c	2016-09-30 21:31:41 UTC (rev 69614)
+++ grass/trunk/display/d.linegraph/main.c	2016-09-30 21:35:10 UTC (rev 69615)
@@ -38,8 +38,12 @@
 #include <grass/glocale.h>
 #include "linegraph.h"
 
+#ifndef MAX
 #define MAX(x,y) ((x) > (y) ? (x) : (y))
+#endif
+#ifndef MIN
 #define MIN(x,y) ((x) < (y) ? (x) : (y))
+#endif
 
 /* the default order of precedence of colors to use for Y lines */
 int default_y_colors[] = {

_______________________________________________
grass-commit mailing list
grass-commit@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/grass-commit
[prev in list] [next in list] [prev in thread] [next in thread]