wrapped the min() inline functions with better preprocessor checks

This commit is contained in:
John Safranek
2015-05-13 14:53:11 -07:00
parent 69b4b37e86
commit 4e482a348e
16 changed files with 60 additions and 40 deletions

View File

@@ -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