diff options
author | Jan Niklas Hasse <jhasse@bixense.com> | 2019-11-24 12:14:09 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-24 12:14:09 (GMT) |
commit | 3b82f99a8843813704345e625034f6c6f3e462d7 (patch) | |
tree | 15f3304bc3aaf3ed58022ddc14dc97f32cd71f00 | |
parent | ed154b90522eaa47f255f416e882de9f9771aadf (diff) | |
parent | 288f04eb171f18818950ffb235ded7c11e3cc92b (diff) | |
download | Ninja-3b82f99a8843813704345e625034f6c6f3e462d7.zip Ninja-3b82f99a8843813704345e625034f6c6f3e462d7.tar.gz Ninja-3b82f99a8843813704345e625034f6c6f3e462d7.tar.bz2 |
Merge pull request #1666 from Helenerineium/master
Fix warnings on mingw builds
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rwxr-xr-x | configure.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2390732..582e0ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ endif() #Fixes GetActiveProcessorCount on MinGW if(MINGW) -target_compile_definitions(libninja PRIVATE _WIN32_WINNT=0x0601) +target_compile_definitions(libninja PRIVATE _WIN32_WINNT=0x0601 __USE_MINGW_ANSI_STDIO=1) endif() # Main executable is library plus main() function. diff --git a/configure.py b/configure.py index 1d6ee7d..7d8ce90 100755 --- a/configure.py +++ b/configure.py @@ -356,7 +356,7 @@ else: except: pass if platform.is_mingw(): - cflags += ['-D_WIN32_WINNT=0x0601'] + cflags += ['-D_WIN32_WINNT=0x0601', '-D__USE_MINGW_ANSI_STDIO=1'] ldflags = ['-L$builddir'] if platform.uses_usr_local(): cflags.append('-I/usr/local/include') |