diff options
author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-11-30 00:53:10 +0000 |
---|---|---|
committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-11-30 00:53:10 +0000 |
commit | ce2af47d41cc790df1b18d9e80295a38747de19f (patch) | |
tree | b9e75709ec7e75dada1c77a3ea70f1304091cae9 /plugins/Zlib | |
parent | a5574d24bc8c0e94c8880c75f0fd27d08d30b98b (diff) |
code cleanup, x64 fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@11163 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Zlib')
-rw-r--r-- | plugins/Zlib/src/zlib.h | 10 | ||||
-rw-r--r-- | plugins/Zlib/src/zutil.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Zlib/src/zlib.h b/plugins/Zlib/src/zlib.h index 3e0c7672ac..7108fdafb3 100644 --- a/plugins/Zlib/src/zlib.h +++ b/plugins/Zlib/src/zlib.h @@ -1645,18 +1645,18 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, const char *version, int stream_size)); #define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream)) + deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) #define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream)) + inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, (int)sizeof(z_stream)) + (strategy), ZLIB_VERSION, sizeof(z_stream)) #define inflateInit2(strm, windowBits) \ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \ - (int)sizeof(z_stream)) + sizeof(z_stream)) #define inflateBackInit(strm, windowBits, window) \ inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, (int)sizeof(z_stream)) + ZLIB_VERSION, sizeof(z_stream)) #ifndef Z_SOLO diff --git a/plugins/Zlib/src/zutil.c b/plugins/Zlib/src/zutil.c index 23d2ebef00..f0fef231f2 100644 --- a/plugins/Zlib/src/zutil.c +++ b/plugins/Zlib/src/zutil.c @@ -37,25 +37,25 @@ uLong ZEXPORT zlibCompileFlags() uLong flags; flags = 0; - switch ((int)(sizeof(uInt))) { + switch (sizeof(uInt)) { case 2: break; case 4: flags += 1; break; case 8: flags += 2; break; default: flags += 3; } - switch ((int)(sizeof(uLong))) { + switch (sizeof(uLong)) { case 2: break; case 4: flags += 1 << 2; break; case 8: flags += 2 << 2; break; default: flags += 3 << 2; } - switch ((int)(sizeof(voidpf))) { + switch (sizeof(voidpf)) { case 2: break; case 4: flags += 1 << 4; break; case 8: flags += 2 << 4; break; default: flags += 3 << 4; } - switch ((int)(sizeof(z_off_t))) { + switch (sizeof(z_off_t)) { case 2: break; case 4: flags += 1 << 6; break; case 8: flags += 2 << 6; break; |