Added back pragma warnings and changed to be MSVC-specific
parent
c5b6b26b8b
commit
d018c3b555
|
@ -43,10 +43,10 @@
|
|||
|
||||
#include "crypt.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4244)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
|
@ -164,8 +164,8 @@ int crypthead(const char *passwd, uint8_t *buf, int buf_size, uint32_t *pkeys,
|
|||
return n;
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
/***************************************************************************/
|
||||
|
|
|
@ -23,8 +23,10 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
# define snprintf _snprintf
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4131 4100)
|
||||
#endif
|
||||
# ifdef __clang__
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wunused-parameter"
|
||||
|
@ -357,9 +359,9 @@ void fill_fopen64_filefunc(zlib_filefunc64_def *pzlib_filefunc_def)
|
|||
pzlib_filefunc_def->opaque = NULL;
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
# ifdef __clang__
|
||||
# pragma clang diagnostic pop
|
||||
# endif
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
|
|
@ -73,10 +73,10 @@
|
|||
# define TRYFREE(p) {if (p) free(p);}
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable : 4131 4244 4189 4245)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
||||
|
||||
const char unz_copyright[] =
|
||||
" unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
|
||||
|
@ -1995,6 +1995,6 @@ extern int ZEXPORT unzEndOfFile(unzFile file)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(pop)
|
||||
#endif // _WIN32
|
||||
#endif // _MSC_VER
|
Loading…
Reference in New Issue