summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2016-02-05 16:39:40 (GMT)
committerNico Weber <nicolasweber@gmx.de>2016-02-05 16:39:40 (GMT)
commita4d4787de199694d3d36f50bf18d82a9124d4b03 (patch)
treea896238d18f18e3cc97ece6313c042bd29089b42
parent8028e91a9dc90b51b4da7ded70cc38234ed62451 (diff)
parentab652787de83d94af71711ae211c4223958457c4 (diff)
downloadNinja-a4d4787de199694d3d36f50bf18d82a9124d4b03.zip
Ninja-a4d4787de199694d3d36f50bf18d82a9124d4b03.tar.gz
Ninja-a4d4787de199694d3d36f50bf18d82a9124d4b03.tar.bz2
Merge pull request #1101 from fbenkstein/vs2010
disable warning about conditional expressions
-rwxr-xr-xconfigure.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.py b/configure.py
index 1c97db7..92d0573 100755
--- a/configure.py
+++ b/configure.py
@@ -302,6 +302,8 @@ if platform.is_msvc():
'/WX', # Warnings as errors.
'/wd4530', '/wd4100', '/wd4706',
'/wd4512', '/wd4800', '/wd4702', '/wd4819',
+ # Disable warnings about constant conditional expressions.
+ '/wd4127',
# Disable warnings about passing "this" during initialization.
'/wd4355',
# Disable warnings about ignored typedef in DbgHelp.h