From: Rich Salz <rsalz@openssl.org>
Date: Tue, 9 May 2017 17:27:30 +0000 (-0400)
Subject: Ignore MSVC warnings (via Gisle Vanem)
X-Git-Tag: OpenSSL_1_1_1-pre1~1547
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=05004f366ecd6b4fcc968739648be9b7fd87df3f;p=oweals%2Fopenssl.git

Ignore MSVC warnings (via Gisle Vanem)

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3420)
---

diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index a3adc647ca..88d7d977b9 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