diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-01-19 16:08:43 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-01-19 16:39:11 +0300 |
commit | 623a64f2c96b71f8609eccb81cb04886ae390c7b (patch) | |
tree | 1d9c782f26e3e4a4dba2dfc53de5729f8c2684ff /src/net/download.cpp | |
parent | b7c9e3c0fd5b17c6964c81bb742c2cef1630d50e (diff) | |
download | manaverse-623a64f2c96b71f8609eccb81cb04886ae390c7b.tar.gz manaverse-623a64f2c96b71f8609eccb81cb04886ae390c7b.tar.bz2 manaverse-623a64f2c96b71f8609eccb81cb04886ae390c7b.tar.xz manaverse-623a64f2c96b71f8609eccb81cb04886ae390c7b.zip |
Dump on startup linked and loaded lib versions.
For now only zlib supported.
Also detect zlib by pkgconfig in configure.
Diffstat (limited to 'src/net/download.cpp')
-rw-r--r-- | src/net/download.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp index 7d7869001..ad66fa121 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -143,7 +143,7 @@ unsigned long Download::fadler32(FILE *const file) // Calculate Adler-32 checksum char *const buffer = new char[CAST_SIZE(fileSize)]; const uInt read = static_cast<uInt>(fread(buffer, 1, fileSize, file)); - unsigned long adler = adler32(0L, Z_NULL, 0); + unsigned long adler = adler32(0L, nullptr, 0); adler = adler32(static_cast<uInt>(adler), reinterpret_cast<Bytef*>(buffer), read); delete [] buffer; @@ -153,7 +153,7 @@ unsigned long Download::fadler32(FILE *const file) unsigned long Download::adlerBuffer(const char *const buffer, int size) { FUNC_BLOCK("Download::adlerBuffer", 1) - unsigned long adler = adler32(0L, Z_NULL, 0); + unsigned long adler = adler32(0L, nullptr, 0); return adler32(static_cast<uInt>(adler), reinterpret_cast<const Bytef*>(buffer), size); } |