[openssh-commits] [openssh] 01/02: ifdef out MIN and MAX.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 80032102d05e866dc2a48a5caf760cf42c2e090e
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Thu Apr 8 13:25:57 2021 +1000

    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.
---
 openbsd-compat/memmem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openbsd-compat/memmem.c b/openbsd-compat/memmem.c
index ac1243eb..ad330d1a 100644
--- 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))))

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.