diff options
| author | Randall Lee <randall.lee@mapbox.com> | 2018-05-22 14:09:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:09:36 -0400 |
| commit | d858cb783b499a1cc77b48a0faee137ca5e6a423 (patch) | |
| tree | 5c36c353730e3050d44e472545519c0429723266 /src/mbgl/util/compression.cpp | |
| parent | f93d722458be62d567aa152711a014ef51a90193 (diff) | |
| parent | 60505b03174b5ec02ae723beafa7683f6ed54a62 (diff) | |
| download | qtlocation-mapboxgl-upstream/rclee-async-setup.tar.gz | |
Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup
Diffstat (limited to 'src/mbgl/util/compression.cpp')
| -rw-r--r-- | src/mbgl/util/compression.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp index 30e813cbb8..ee3ebe7cae 100644 --- a/src/mbgl/util/compression.cpp +++ b/src/mbgl/util/compression.cpp @@ -1,6 +1,6 @@ #include <mbgl/util/compression.hpp> -#if defined(__QT__) && defined(_WINDOWS) +#if defined(__QT__) && defined(_WINDOWS) && !defined(__GNUC__) #include <QtZlib/zlib.h> #else #include <zlib.h> |