As done everywhere else, use a local version of MINIMUM() and avoid

conflict against a potential define min() from some other scope.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/arc4random/getentropy_osx.c b/src/lib/libcrypto/arc4random/getentropy_osx.c
index 26dcc824de..5d4067bb8e 100644
--- a/src/lib/libcrypto/arc4random/getentropy_osx.c
+++ b/src/lib/libcrypto/arc4random/getentropy_osx.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getentropy_osx.c,v 1.12 2018/11/20 08:04:28 deraadt Exp $     */
+/*      $OpenBSD: getentropy_osx.c,v 1.13 2020/05/17 14:44:20 deraadt Exp $     */
 
 /*
  * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -66,7 +66,7 @@
 #define SHA512_DIGEST_LENGTH CC_SHA512_DIGEST_LENGTH
 
 #define REPEAT 5
-#define min(a, b) (((a) < (b)) ? (a) : (b))
+#define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
 
 #define HX(a, b) \
         do { \
@@ -407,8 +407,8 @@ getentropy_fallback(void *buf, size_t len)
                 }
 
                 SHA512_Final(results, &ctx);
-                memcpy((char *)buf + i, results, min(sizeof(results), len - i));
-                i += min(sizeof(results), len - i);
+                memcpy((char *)buf + i, results, MINIMUM(sizeof(results), len - i));
+                i += MINIMUM(sizeof(results), len - i);
         }
         explicit_bzero(&ctx, sizeof ctx);
         explicit_bzero(results, sizeof results);