ifdef out MIN and MAX.

In -portable, defines.h ensures that these are defined, so redefining
potentially causes a warning.  We don't just delete it to make any
future code syncs a little but easier.  bz#3293.

diff --git a/openbsd-compat/memmem.c b/openbsd-compat/memmem.c
index ac1243eb0d1750884c9a0fda951f263336d6e4b6..ad330d1a8879cfe581c3fe711fa2ec2d5e78f1ed 100644 (file)
--- a/openbsd-compat/memmem.c
+++ b/openbsd-compat/memmem.c
@@ -61,8 +61,11 @@ fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
        return hw == nw ? (char *)h-4 : 0;
 }
 
+#if 0
+/* In -portable, defines.h ensures that these are already defined. */
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
 
 #define BITOP(a,b,op) \
  ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))