From 7b8fa42ae13c47102173f4268b8ffacccc3303f9 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 8 Sep 2020 13:12:11 -0700 Subject: [PATCH] Fix for bad pre-processor logic. Some compilers are unhappy with the `#sslpro` even in a block of code not used! --- cyassl/ctaocrypt/settings.h | 4 +++- wolfssl/wolfcrypt/settings.h | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cyassl/ctaocrypt/settings.h b/cyassl/ctaocrypt/settings.h index 4cea7e201..5a6df5bf4 100644 --- a/cyassl/ctaocrypt/settings.h +++ b/cyassl/ctaocrypt/settings.h @@ -341,7 +341,9 @@ #undef SIZEOF_LONG #define SIZEOF_LONG_LONG 8 #else - #sslpro: settings.h - please implement SIZEOF_LONG and SIZEOF_LONG_LONG + #if !defined(SIZEOF_LONG) && !defined(SIZEOF_LONG_LONG) + #error settings.h - please implement SIZEOF_LONG and SIZEOF_LONG_LONG + #endif #endif #define XMALLOC(s, h, type) ((void *)rtp_malloc((s), SSL_PRO_MALLOC)) diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h index 917a391bc..b683e73b0 100644 --- a/wolfssl/wolfcrypt/settings.h +++ b/wolfssl/wolfcrypt/settings.h @@ -831,7 +831,9 @@ extern void uITRON4_free(void *p) ; #undef SIZEOF_LONG #define SIZEOF_LONG_LONG 8 #else - #error settings.h - please implement SIZEOF_LONG and SIZEOF_LONG_LONG + #if !defined(SIZEOF_LONG) && !defined(SIZEOF_LONG_LONG) + #error settings.h - please implement SIZEOF_LONG and SIZEOF_LONG_LONG + #endif #endif #define XMALLOC(s, h, type) ((void *)rtp_malloc((s), SSL_PRO_MALLOC)) @@ -841,7 +843,9 @@ extern void uITRON4_free(void *p) ; #if (WINMSP3) #define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n)) #else - #sslpro: settings.h - please implement XSTRNCASECMP - needed for HAVE_ECC + #ifndef XSTRNCASECMP + #error settings.h - please implement XSTRNCASECMP - needed for HAVE_ECC + #endif #endif #define WOLFSSL_HAVE_MAX