summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-01-19 16:08:43 +0300
committerAndrei Karas <akaras@inbox.ru>2017-01-19 16:39:11 +0300
commit623a64f2c96b71f8609eccb81cb04886ae390c7b (patch)
tree1d9c782f26e3e4a4dba2dfc53de5729f8c2684ff /src/resources
parentb7c9e3c0fd5b17c6964c81bb742c2cef1630d50e (diff)
downloadplus-623a64f2c96b71f8609eccb81cb04886ae390c7b.tar.gz
plus-623a64f2c96b71f8609eccb81cb04886ae390c7b.tar.bz2
plus-623a64f2c96b71f8609eccb81cb04886ae390c7b.tar.xz
plus-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/resources')
-rw-r--r--src/resources/mapreader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 9156f334d..cfce7c397 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -128,9 +128,9 @@ int inflateMemory(unsigned char *restrict const in,
out = static_cast<unsigned char*>(calloc(bufferSize, 1));
z_stream strm;
- strm.zalloc = Z_NULL;
- strm.zfree = Z_NULL;
- strm.opaque = Z_NULL;
+ strm.zalloc = nullptr;
+ strm.zfree = nullptr;
+ strm.opaque = nullptr;
strm.next_in = in;
strm.avail_in = inLength;
strm.next_out = out;