Define MIN() and MAX() correctly and exactly once (#1795)

Instead of many .c and .h files defining, undefing and redefining MIN() and MAX() have <grass/gis.h> (re)define each macro. Besides the obvious code deduplication, this addresses a number of compiler warnings: main.c:51: warning: "MIN" redefined main.c:52: warning: "MAX" redefined main.c:30: warning: "MIN" redefined main.c:31: warning: "MAX" redefined contour.h:10: warning: "MIN" redefined contour.h:10: warning: "MIN" redefined contour.h:10: warning: "MIN" redefined contour.h:10: warning: "MIN" redefined contour.h:10: warning: "MIN" redefined frac.h:19: warning: "MAX" redefined frac.h:19: warning: "MAX" redefined frac.h:19: warning: "MAX" redefined frac.h:19: warning: "MAX" redefined This also addresses another, less apparent problem: macro definitions that lack sufficient parenthesis around their arguments are a classic error. For example, this definition evaluates incorrectly when b is a ternary conditional itself: #define MAX(a,b) (a > b ? a : b) Resolve the name clash in raster/r.stats.zonal/main.c with a prefix and fixup indentation while at it.
OSGeo · Aug 25, 2021 · 3089db7 · 3089db7
1 parent c863b71
commit 3089db7
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 219 deletions.
diff --git a/display/d.linegraph/main.c b/display/d.linegraph/main.c
@@ -41,13 +41,6 @@
 #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[] = {
     0,

diff --git a/imagery/i.segment/region_growing.c b/imagery/i.segment/region_growing.c
@@ -16,15 +16,6 @@
 
 #define EPSILON 1.0e-8
 
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a,b) ( ((a) > (b)) ? (a) : (b) )
-#ifdef MIN
-#undef MIN
-#endif
-#define MIN(a,b) ( ((a) < (b)) ? (a) : (b) )
-
 struct idlist
 {
     int *ids;

diff --git a/include/grass/gis.h b/include/grass/gis.h
@@ -129,6 +129,16 @@ static const char *GRASS_copyright __attribute__ ((unused))
 #define CONFIG_DIR ".grass8"
 #endif
 
+#ifdef MAX
+#undef MAX
+#endif
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
+#ifdef MIN
+#undef MIN
+#endif
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 /* define PI and friends */
 #undef M_PI
 #define M_PI    3.14159265358979323846	/* pi */

diff --git a/lib/btree2/kdtree.c b/lib/btree2/kdtree.c
@@ -20,11 +20,6 @@
 #include <grass/glocale.h>
 #include "kdtree.h"
 
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-
 #define KD_BTOL 7
 
 #ifdef KD_DEBUG

diff --git a/lib/cairodriver/line_width.c b/lib/cairodriver/line_width.c
@@ -12,14 +12,11 @@
   \author Glynn Clements  
 */
 
+#include <grass/gis.h>
 #include "cairodriver.h"
 
 #define MIN_WIDTH 1
 
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
 static double previous_width = -1;
 
 /*!

diff --git a/lib/cairodriver/raster.c b/lib/cairodriver/raster.c
@@ -15,15 +15,10 @@
 #include <math.h>
 
 #include "cairodriver.h"
+#include <grass/gis.h>
 #include <grass/glocale.h>
 
 #define MAX_IMAGE_SIZE 32767
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
 
 static int src_t, src_b, src_l, src_r, src_w, src_h;
 static int dst_t, dst_b, dst_l, dst_r, dst_w, dst_h;

diff --git a/lib/imagery/georef_tps.c b/lib/imagery/georef_tps.c
@@ -42,13 +42,6 @@ struct MATRIX
 
 #define MAXORDER 3    /* HIGHEST SUPPORTED ORDER OF TRANSFORMATION */
 
-#ifndef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-#endif
-#ifndef MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-#endif
-
 /***********************************************************************
 
   FUNCTION PROTOTYPES FOR STATIC (INTERNAL) FUNCTIONS

diff --git a/lib/raster/fpreclass.c b/lib/raster/fpreclass.c
@@ -246,11 +246,6 @@
 
 /*--------------------------------------------------------------------------*/
 
-#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)
 #define NO_RIGHT_INFINITE_RULE (! r->infiniteRightSet)

diff --git a/lib/raster/quant.c b/lib/raster/quant.c
@@ -27,11 +27,6 @@ static int double_comp(const void *, const void *);
 #define MAX_LOOKUP_TABLE_SIZE 2048
 #define NO_DATA (Rast_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)

diff --git a/lib/raster3d/tilewrite.c b/lib/raster3d/tilewrite.c
@@ -3,6 +3,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <grass/gis.h>
 #include <grass/raster.h>
 #include "raster3d_intern.h"
 
@@ -276,12 +277,6 @@ int Rast3d_flush_tile(RASTER3D_Map * map, int tileIndex)
 
 /*---------------------------------------------------------------------------*/
 
-#ifndef MIN
-#define MIN(a,b) (a < b ? a : b)
-#define MAX(a,b) (a > b ? a : b)
-#endif
-
-
 /*!
  * \brief 
  *

diff --git a/lib/vector/Vlib/buffer2.c b/lib/vector/Vlib/buffer2.c
@@ -18,18 +18,13 @@
 
 #include <stdlib.h>
 #include <math.h>
+#include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/glocale.h>
 
 #include "dgraph.h"
 
 #define LENGTH(DX, DY) (sqrt((DX*DX)+(DY*DY)))
-#ifndef MIN
-#define MIN(X,Y) ((X<Y)?X:Y)
-#endif
-#ifndef MAX
-#define MAX(X,Y) ((X>Y)?X:Y)
-#endif
 #define PI M_PI
 #define RIGHT_SIDE 1
 #define LEFT_SIDE -1

diff --git a/lib/vector/Vlib/dgraph.c b/lib/vector/Vlib/dgraph.c
@@ -16,18 +16,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/glocale.h>
 #include "dgraph.h"
 #include "e_intersect.h"
 
 #define LENGTH(DX, DY) (sqrt((DX*DX)+(DY*DY)))
-#ifndef MIN
-#define MIN(X,Y) ((X<Y)?X:Y)
-#endif
-#ifndef MAX
-#define MAX(X,Y) ((X>Y)?X:Y)
-#endif
 #define PI M_PI
 
 struct intersection_point

diff --git a/lib/vector/Vlib/e_intersect.c b/lib/vector/Vlib/e_intersect.c
@@ -21,12 +21,6 @@
 #include "e_intersect.h"
 
 #define SWAP(a,b) {double t = a; a = b; b = t;}
-#ifndef MIN
-#define MIN(X,Y) ((X<Y)?X:Y)
-#endif
-#ifndef MAX
-#define MAX(X,Y) ((X>Y)?X:Y)
-#endif
 #define D ((ax2-ax1)*(by1-by2) - (ay2-ay1)*(bx1-bx2))
 #define DA ((bx1-ax1)*(by1-by2) - (by1-ay1)*(bx1-bx2))
 #define DB ((ax2-ax1)*(by1-ay1) - (ay2-ay1)*(bx1-ax1))

diff --git a/lib/vector/dglib/graph.c b/lib/vector/dglib/graph.c
@@ -30,6 +30,7 @@
 
 #define DGL_V2 1
 
+#include <grass/gis.h>
 #include "type.h"
 #include "tree.h"
 #include "graph.h"
@@ -1687,10 +1688,6 @@ int dglWriteChunk(dglIOContext_s * pIO, dglWriteChunk_fn pfn, void *pv)
     return 0;
 }
 
-#ifndef MIN
-#define MIN(x,y)	(((x)<(y))?x:y)
-#endif
-
 int dglReadChunk(dglIOContext_s * pIO, dglByte_t * pbChunk, int cbChunk)
 {
     int i, c;

diff --git a/lib/vector/rtree/rect.c b/lib/vector/rtree/rect.c
@@ -23,13 +23,12 @@
 
 #include <float.h>
 #include <math.h>
+#include <grass/gis.h>
 
 #define BIG_NUM (FLT_MAX/4.0)
 
 
 #define Undefined(x, t) ((x)->boundary[0] > (x)->boundary[t->ndims_alloc])
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 /*!
  \brief Create a new rectangle for a given tree

diff --git a/raster/r.buildvrt/proto.h b/raster/r.buildvrt/proto.h
@@ -1,10 +1,6 @@
+#include <grass/gis.h>
 #include <grass/raster.h>
 
-#undef MIN
-#undef MAX
-#define MIN(a,b)      ((a) < (b) ? (a) : (b))
-#define MAX(a,b)      ((a) > (b) ? (a) : (b))
-
 struct input
 {
     const char *name;

diff --git a/raster/r.external/proto.h b/raster/r.external/proto.h
@@ -1,10 +1,6 @@
+#include <grass/gis.h>
 #include <grass/raster.h>
 
-#undef MIN
-#undef MAX
-#define MIN(a,b)      ((a) < (b) ? (a) : (b))
-#define MAX(a,b)      ((a) > (b) ? (a) : (b))
-
 struct band_info
 {
     RASTER_MAP_TYPE data_type;

diff --git a/raster/r.geomorphon/local_proto.h b/raster/r.geomorphon/local_proto.h
@@ -27,14 +27,6 @@
 #define DEGREE2RAD(a) ((a)/(180/PI))
 #define RAD2DEGREE(a) ((a)*(180/PI))
 
-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
 /* Number of cardinal directions. */
 #define NUM_DIRS 8
 

diff --git a/raster/r.grow.distance/main.c b/raster/r.grow.distance/main.c
@@ -37,9 +37,6 @@ static DCELL *old_val_row, *new_val_row;
 static double (*distance) (double dx, double dy);
 static double xres, yres;
 
-#undef MAX
-#define MAX(a, b)	((a) > (b) ? (a) : (b))
-
 static double distance_euclidean_squared(double dx, double dy)
 {
     return dx * dx + dy * dy;

diff --git a/raster/r.in.gdal/main.c b/raster/r.in.gdal/main.c
@@ -32,11 +32,6 @@
 #include <gdal.h>
 #include <cpl_conv.h>
 
-#undef MIN
-#undef MAX
-#define MIN(a,b)      ((a) < (b) ? (a) : (b))
-#define MAX(a,b)      ((a) > (b) ? (a) : (b))
-
 void check_projection(struct Cell_head *cellhd, GDALDatasetH hDS,
                       char *outloc, int create_only, int override,
 		      int check_only);

diff --git a/raster/r.out.pov/main.c b/raster/r.out.pov/main.c
@@ -48,9 +48,6 @@ void processProfiles(int inputFile, FILE * outputF);
 #define     YMAX     65536	/*  max length scan line */
 #define     XMAX     65536	/*  max # of scan lines */
 
-#define MIN(x,y)     (((x) < (y)) ? (x) : (y))
-#define MAX(x,y)     (((x) > (y)) ? (x) : (y))
-
 #define SW     0
 #define NW     1
 #define NE     2

diff --git a/raster/r.proj/bordwalk.c b/raster/r.proj/bordwalk.c
@@ -33,16 +33,6 @@
 #include <grass/glocale.h>
 #include "r.proj.h"
 
-#ifdef MIN
-#undef MIN
-#endif
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-
-#ifdef MAX
-#undef MAX
-#endif
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-
 static void debug(const char *name, const struct Cell_head *hd)
 {
     G_debug(3, "%s: xmin: %f; xmax: %f; ymin: %f; ymax: %f",