From: Matt Caswell Date: Thu, 6 Dec 2018 14:42:17 +0000 (+0000) Subject: Remove the cast from the definition of OPENSSL_VERSION_NUMBER X-Git-Tag: openssl-3.0.0-alpha1~2757 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d609f22d28615c45685d9da871d432e9cb81127;p=oweals%2Fopenssl.git Remove the cast from the definition of OPENSSL_VERSION_NUMBER If a cast is included in the definition it cannot be used in preprocessor expressions, e.g. "#if OPENSSL_VERSION_NUMBER > 0x10000000L" [extended tests] Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/7839) --- diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 6722ce3df4..08d907588f 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -131,7 +131,7 @@ const char *OPENSSL_version_build_metadata(void); # define _OPENSSL_VERSION_PRE_RELEASE 0xf # endif # define OPENSSL_VERSION_NUMBER \ - (long)( (OPENSSL_VERSION_MAJOR<<28) \ + ( (OPENSSL_VERSION_MAJOR<<28) \ |(OPENSSL_VERSION_MINOR<<20) \ |(OPENSSL_VERSION_PATCH<<4) \ |_OPENSSL_VERSION_PRE_RELEASE )