Change RC5_32_set_key to return an int type

[openssl.git] / include / openssl / opensslv.h

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 08d907588f1c511ce238ede1dfd301e2be3148b5..0219d5fd673c08a3ad9df54dcdd6217dd726f29e 100644 (file)
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -78,7 +78,7 @@ extern "C" {
 
 /* For checking general API compatibility when preprocessing */
 # define OPENSSL_VERSION_PREREQ(maj,min)                                \
-    ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= (maj << 16) + min)
+    ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min))
 
 /* Helper macros for CPP string composition */
 #   define OPENSSL_MSTR_HELPER(x) #x
@@ -126,9 +126,9 @@ const char *OPENSSL_version_build_metadata(void);
 # if !OPENSSL_API_4
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 #  ifdef OPENSSL_VERSION_PRE_RELEASE
-#   define _OPENSSL_VERSION_PRE_RELEASE 0x0
+#   define _OPENSSL_VERSION_PRE_RELEASE 0x0L
 #  else
-#   define _OPENSSL_VERSION_PRE_RELEASE 0xf
+#   define _OPENSSL_VERSION_PRE_RELEASE 0xfL
 #  endif
 #  define OPENSSL_VERSION_NUMBER        \
           ( (OPENSSL_VERSION_MAJOR<<28)  \