Merge pull request #3034 from tautschnig/miniz-warnings

miniz: silence warnings

Author: tautschnig

jbmc/src/miniz/Makefile

@@ -1,7 +1,7 @@
 SRC = miniz.cpp \
       # Empty last line
 
-INCLUDES= -I ..
+INCLUDES= -I ../$(CPROVER_DIR)/src
 
 include ../config.inc
 include ../$(CPROVER_DIR)/src/config.inc

jbmc/src/miniz/miniz.cpp

@@ -24,6 +24,13 @@
  *
  **************************************************************************/
 
+#ifdef _MSC_VER
+#pragma warning(disable:4548)
+  // expression before comma has no effect
+#pragma warning(disable:4061)
+  // enum case is not handled in switch
+#endif
+
 #include  "miniz.h"
 
 typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];

jbmc/src/miniz/miniz.h

@@ -173,6 +173,11 @@
 #pragma once
 
 
+#ifdef _MSC_VER
+#include <util/pragma_push.def>
+#pragma warning(disable:4668)
+  // using #if/#elif on undefined macro
+#endif
 
 
 
@@ -1351,3 +1356,7 @@ void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const ch
 #ifdef __cplusplus
 }
 #endif
+
+#ifdef _MSC_VER
+#include <util/pragma_pop.def>
+#endif