From 9a895dff2755de70e68893c5f7252adb449d847e Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <tmpsantos@gmail.com>
Date: Mon, 18 Feb 2019 16:33:43 +0200
Subject: [build] Use the correct define on Windows

https://blog.kowalczyk.info/article/j/guide-to-predefined-macros-in-c-compilers-gcc-clang-msvc-etc..html
---
 include/mbgl/platform/gl_functions.hpp                   | 2 +-
 platform/default/src/mbgl/storage/local_file_request.cpp | 2 +-
 platform/qt/qt.cmake                                     | 1 -
 src/mbgl/util/chrono.cpp                                 | 2 +-
 src/mbgl/util/compression.cpp                            | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/mbgl/platform/gl_functions.hpp b/include/mbgl/platform/gl_functions.hpp
index a007a48b88..fab3e3aa36 100644
--- a/include/mbgl/platform/gl_functions.hpp
+++ b/include/mbgl/platform/gl_functions.hpp
@@ -26,7 +26,7 @@ using GLubyte = unsigned char;
 using GLuint = unsigned int;
 using GLvoid = void;
 
-#if defined(_WINDOWS)
+#if defined(_WIN32)
 using GLintptr = long long;
 using GLsizeiptr = long long;
 #else
diff --git a/platform/default/src/mbgl/storage/local_file_request.cpp b/platform/default/src/mbgl/storage/local_file_request.cpp
index 084e6ff1b0..9f2351a5b7 100644
--- a/platform/default/src/mbgl/storage/local_file_request.cpp
+++ b/platform/default/src/mbgl/storage/local_file_request.cpp
@@ -5,7 +5,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined(_WINDOWS) && !defined(S_ISDIR)
+#if defined(_WIN32) && !defined(S_ISDIR)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 63723aa9ba..14f09007ac 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -157,7 +157,6 @@ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     add_definitions("-DQT_COMPILING_QIMAGE_COMPAT_CPP")
     add_definitions("-DRAPIDJSON_HAS_CXX11_RVALUE_REFS")
     add_definitions("-D_USE_MATH_DEFINES")
-    add_definitions("-D_WINDOWS")
 
     add_definitions("-Wno-deprecated-declarations")
     add_definitions("-Wno-macro-redefined")
diff --git a/src/mbgl/util/chrono.cpp b/src/mbgl/util/chrono.cpp
index c304548cf1..6674e73c42 100644
--- a/src/mbgl/util/chrono.cpp
+++ b/src/mbgl/util/chrono.cpp
@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <ctime>
 
-#if defined(_WINDOWS)
+#if defined(_WIN32)
 #define _gmtime(t, i) gmtime_s(i, t)
 #else
 #define _gmtime(t, i) gmtime_r(t, i)
diff --git a/src/mbgl/util/compression.cpp b/src/mbgl/util/compression.cpp
index ee3ebe7cae..1742898f9e 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) && !defined(__GNUC__)
+#if defined(__QT__) && defined(_WIN32) && !defined(__GNUC__)
 #include <QtZlib/zlib.h>
 #else
 #include <zlib.h>
-- 
cgit v1.2.1