浏览代码

#undef MIN/MAX, as GDAL headers also define these
Fix lack of parentheses in MIN/MAX


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32931 15284696-431f-4ddb-bdfa-cd5b030d7da7

Glynn Clements 17 年之前
父节点
当前提交
9540cceaa7
共有 2 个文件被更改,包括 9 次插入4 次删除
  1. 4 2
      lib/gis/fpreclass.c
  2. 5 2
      lib/gis/quant.c

+ 4 - 2
lib/gis/fpreclass.c

@@ -245,8 +245,10 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define MIN(a,b) (a < b ? a : b)
-#define MAX(a,b) (a > b ? a : b)
+#undef MIN
+#undef MAX
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
 
 #define NO_DEFAULT_RULE (! r->defaultDRuleSet)
 #define NO_LEFT_INFINITE_RULE (! r->infiniteLeftSet)

+ 5 - 2
lib/gis/quant.c

@@ -290,10 +290,13 @@ static int double_comp(const void *, const void *);
 
 #define USE_LOOKUP 1
 #define MAX_LOOKUP_TABLE_SIZE 2048
-#define MIN(a,b) (a < b ? a : b)
-#define MAX(a,b) (a > b ? a : b)
 #define NO_DATA (G_set_c_null_value (&tmp, 1), (CELL) tmp)
 
+#undef MIN
+#undef MAX
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+
 #define NO_LEFT_INFINITE_RULE (! q->infiniteLeftSet)
 #define NO_RIGHT_INFINITE_RULE (! q->infiniteRightSet)
 #define NO_FINITE_RULE (q->nofRules <= 0)