Sfoglia il codice sorgente

Revert "Removed pragma warnings"

This reverts commit 4961241c09ff68d7eed4e36916885ca6a1e73b48.
ethaninfinity 3 anni fa
parent
commit
c5b6b26b8b
3 ha cambiato i file con 22 aggiunte e 1 eliminazioni
  1. 9 0
      contrib/unzip/crypt.c
  2. 3 0
      contrib/unzip/ioapi.c
  3. 10 1
      contrib/unzip/unzip.c

+ 9 - 0
contrib/unzip/crypt.c

@@ -43,6 +43,11 @@
 
 #include "crypt.h"
 
+#ifdef _WIN32
+#   pragma warning(push)
+#   pragma warning(disable : 4244)
+#endif // _WIN32
+
 /***************************************************************************/
 
 #define CRC32(c, b) ((*(pcrc_32_tab+(((uint32_t)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
@@ -159,4 +164,8 @@ int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
     return n;
 }
 
+#ifdef _WIN32
+#   pragma warning(pop)
+#endif // _WIN32
+
 /***************************************************************************/

+ 3 - 0
contrib/unzip/ioapi.c

@@ -23,6 +23,8 @@
 
 #ifdef _WIN32
 #   define snprintf _snprintf
+#   pragma warning(push)
+#   pragma warning(disable : 4131 4100)
 #   ifdef __clang__
 #       pragma clang diagnostic push
 #       pragma clang diagnostic ignored "-Wunused-parameter"
@@ -356,6 +358,7 @@ void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def)
 }
 
 #ifdef _WIN32
+#   pragma warning(pop)
 #   ifdef __clang__
 #       pragma clang diagnostic pop
 #   endif

+ 10 - 1
contrib/unzip/unzip.c

@@ -73,6 +73,11 @@
 #  define TRYFREE(p) {if (p) free(p);}
 #endif
 
+#ifdef _WIN32
+#   pragma warning(push)
+#   pragma warning(disable : 4131 4244 4189 4245)
+#endif // _WIN32
+
 const char unz_copyright[] =
    " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
@@ -1988,4 +1993,8 @@ extern int ZEXPORT unzEndOfFile(unzFile file)
     if (s->pfile_in_zip_read->rest_read_uncompressed == 0)
         return 1;
     return 0;
-}
+}
+
+#ifdef _WIN32
+#   pragma warning(pop)
+#endif // _WIN32