diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-02-18 16:33:43 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-02-19 16:20:56 +0200 |
| commit | 056073a904361ef9b18e0c38abd7f5c6a187ef22 (patch) | |
| tree | 9be1518ea6564b4e5b78f9da8c11dd55625f17be /platform | |
| parent | 1fc7a9b82ea0c064c20247f0902b3854fff1942f (diff) | |
| download | qtlocation-mapboxgl-056073a904361ef9b18e0c38abd7f5c6a187ef22.tar.gz | |
[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
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/default/src/mbgl/storage/local_file_request.cpp | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 |
2 files changed, 1 insertions, 2 deletions
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") |