From 660e0b868bfd38341f4fa2a2125e135690b3c93b Mon Sep 17 00:00:00 2001 From: John Safranek Date: Thu, 14 May 2015 11:40:23 -0700 Subject: [PATCH] added check for window's api's min macro --- wolfssl/wolfcrypt/wc_port.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h index f5ad02544..c13f394f6 100644 --- a/wolfssl/wolfcrypt/wc_port.h +++ b/wolfssl/wolfcrypt/wc_port.h @@ -193,6 +193,12 @@ WOLFSSL_LOCAL int UnLockMutex(wolfSSL_Mutex*); #endif /* NO_FILESYSTEM */ +/* Windows API defines its own min() macro. */ +#if defined(USE_WINDOWS_API) && defined(min) + #define WOLFSSL_HAVE_MIN +#endif + + #ifdef __cplusplus } /* extern "C" */ #endif