[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  05004f366ecd6b4fcc968739648be9b7fd87df3f (commit)
      from  bb01ef3f4ae3b54b20e0c3afc9b55e43a92fef8f (commit)


- Log -----------------------------------------------------------------
commit 05004f366ecd6b4fcc968739648be9b7fd87df3f
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue May 9 13:27:30 2017 -0400

    Ignore MSVC warnings (via Gisle Vanem)
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3420)

-----------------------------------------------------------------------

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 a3adc64..88d7d97 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