wrapped the min() inline functions with better preprocessor checks

src/internal.c

@@ -135,14 +135,15 @@ static int BuildCertHashes(WOLFSSL* ssl, Hashes* hashes);
 static void PickHashSigAlgo(WOLFSSL* ssl,
                                 const byte* hashSigAlgo, word32 hashSigAlgoSz);
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 int IsTLS(const WOLFSSL* ssl)

src/sniffer.c

@@ -52,14 +52,15 @@
 #endif
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
 static INLINE word32 min(word32 a, word32 b)
 {
     return a > b ? b : a;
 }
 
-#endif
+#endif /* WOLFSSL_HAVE_MIN */
 
 #ifndef WOLFSSL_SNIFFER_TIMEOUT
     #define WOLFSSL_SNIFFER_TIMEOUT 900

src/ssl.c

@@ -77,23 +77,27 @@
     #define FALSE 0
 #endif
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSSL_HAVE_MIN */
+
+#ifndef WOLFSSL_HAVE_MAX
+#define WOLFSSL_HAVE_MAX
 
-#ifndef max
 #ifdef WOLFSSL_DTLS
     static INLINE word32 max(word32 a, word32 b)
     {
         return a > b ? a : b;
     }
-#endif
-#endif /* min */
+#endif /* WOLFSSL_DTLS */
+
+#endif /* WOLFSSL_HAVE_MAX */
 
 
 #ifndef WOLFSSL_LEANPSK

src/tls.c

@@ -41,14 +41,15 @@
 #ifndef NO_TLS
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 #ifdef WOLFSSL_SHA384

wolfcrypt/src/asn.c

@@ -4773,14 +4773,15 @@ int wc_RsaKeyToDer(RsaKey* key, byte* output, word32 inLen)
 #if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 /* Initialize and Set Certficate defaults:

wolfcrypt/src/dh.c

@@ -39,14 +39,15 @@
 #endif
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 void wc_InitDhKey(DhKey* key)

wolfcrypt/src/dsa.c

@@ -39,14 +39,15 @@ enum {
 };
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 void wc_InitDsaKey(DsaKey* key)

wolfcrypt/src/hmac.c

@@ -722,14 +722,15 @@ int wolfSSL_GetHmacMaxSize(void)
 
 #ifdef HAVE_HKDF
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 static INLINE int GetHashSizeByType(int type)

wolfcrypt/src/md4.c

@@ -35,14 +35,15 @@
 #endif
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 void wc_InitMd4(Md4* md4)

wolfcrypt/src/md5.c

@@ -166,14 +166,15 @@
 
 #else /* CTaoCrypt software implementation */
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 void wc_InitMd5(Md5* md5)

wolfcrypt/src/pkcs7.c

@@ -36,12 +36,15 @@
     #include <wolfcrypt/src/misc.c>
 #endif
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
+
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
-#endif
+
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 /* placed ASN.1 contentType OID into *output, return idx on success,

wolfcrypt/src/pwdbased.c

@@ -57,14 +57,15 @@
     #include <wolfcrypt/src/misc.c>
 #endif
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 /* PBKDF1 needs at least SHA available */

wolfcrypt/src/ripemd.c

@@ -36,15 +36,15 @@
 #endif
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
-
+#endif /* WOLFSSL_HAVE_MIN */
 
 void wc_InitRipeMd(RipeMd* ripemd)
 {

wolfcrypt/src/sha.c

@@ -198,14 +198,15 @@ int wc_ShaFinal(Sha* sha, byte* hash)
 
 #else /* wc_ software implementation */
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
-static INLINE word32 min(word32 a, word32 b)
-{
-    return a > b ? b : a;
-}
+    static INLINE word32 min(word32 a, word32 b)
+    {
+        return a > b ? b : a;
+    }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 int wc_InitSha(Sha* sha)

wolfcrypt/src/sha256.c

@@ -289,14 +289,15 @@ static void set_Transform(void) {
     #include "cau_api.h"
 #endif
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 
 int wc_InitSha256(Sha256* sha256)

wolfcrypt/src/sha512.c

@@ -88,14 +88,15 @@ int wc_Sha384Hash(const byte* data, word32 len, byte* out)
 #endif
 
 
-#ifndef min
+#ifndef WOLFSSL_HAVE_MIN
+#define WOLFSSL_HAVE_MIN
 
     static INLINE word32 min(word32 a, word32 b)
     {
         return a > b ? b : a;
     }
 
-#endif /* min */
+#endif /* WOLFSSL_HAVE_MIN */
 
 #if defined(USE_INTEL_SPEEDUP)
   #define HAVE_INTEL_AVX1