The branch OpenSSL_1_1_0-stable has been updated
via 975b993ee6c6772d52d786c6ea43f3d04d6ad88a (commit)
from ad1855847e3bc0e25aa4a013bbc06135bd6c19da (commit)
- Log -----------------------------------------------------------------
commit 975b993ee6c6772d52d786c6ea43f3d04d6ad88a
Author: Rich Salz <[email protected]>
Date: Tue May 9 13:27:30 2017 -0400
Ignore MSVC warnings (via Gisle Vanem)
Reviewed-by: Richard Levitte <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3420)
(cherry picked from commit 05004f366ecd6b4fcc968739648be9b7fd87df3f)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/lhash.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index e2ccb65..82d40c1 100644
--- a/include/openssl/lhash.h
+++ b/include/openssl/lhash.h
@@ -195,8 +195,21 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH
*lh, BIO *out);
LHASH_OF(type)
DEFINE_LHASH_OF(OPENSSL_STRING);
+# ifdef _MSC_VER
+/*
+ * push and pop this warning:
+ * warning C4090: 'function': different 'const' qualifiers
+ */
+# pragma warning (push)
+# pragma warning (disable: 4090)
+# endif
+
DEFINE_LHASH_OF(OPENSSL_CSTRING);
+# ifdef _MSC_VER
+# pragma warning (pop)
+# endif
+
#ifdef __cplusplus
}
#endif
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
