Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Gorshenin <y@maps.me>2017-01-31 11:48:17 +0300
committerYuri Gorshenin <y@maps.me>2017-01-31 11:50:02 +0300
commit1b5f3db2b7257259fa12cda364f0527cc9362570 (patch)
tree2ba9cea048bd7fc7a37772dfafc055813a4a74d8 /coding/zlib.cpp
parentae808a8825c2a513b02d95315215cdc2fa9fcd12 (diff)
[coding] Fixed Android ZLib build.
Diffstat (limited to 'coding/zlib.cpp')
-rw-r--r--coding/zlib.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/coding/zlib.cpp b/coding/zlib.cpp
index 15de3ccf13..652f38e4be 100644
--- a/coding/zlib.cpp
+++ b/coding/zlib.cpp
@@ -1,5 +1,7 @@
#include "coding/zlib.hpp"
+#include "std/target_os.hpp"
+
namespace coding
{
namespace
@@ -57,6 +59,7 @@ ZLib::DeflateProcessor::DeflateProcessor(void const * data, size_t size, ZLib::L
ZLib::DeflateProcessor::~DeflateProcessor() noexcept
{
+#if !defined(OMIM_OS_ANDROID)
unsigned bytes = 0;
int bits = 0;
int const ret = deflatePending(&m_stream, &bytes, &bits);
@@ -64,6 +67,7 @@ ZLib::DeflateProcessor::~DeflateProcessor() noexcept
ASSERT_EQUAL(ret, Z_OK, ());
ASSERT_EQUAL(bytes, 0, (bytes, "bytes were not flushed"));
ASSERT_EQUAL(bits, 0, (bits, "bits were not flushed"));
+#endif
if (m_init)
deflateEnd(&m_stream);