try again on vs2012 build fixes

diff --git a/configure.py b/configure.py
index b40dafb..c526c1a 100755 (executable)
--- a/configure.py
+++ b/configure.py
@@ -127,6 +127,7 @@ if platform == 'windows':
               # We never have strings or arrays larger than 2**31.
               '/wd4267',
               '/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS',
+              '/D_VARIADIC_MAX=10',
               '/DNINJA_PYTHON="%s"' % options.with_python]
     ldflags = ['/DEBUG', '/libpath:$builddir']
     if not options.debug:
@@ -321,7 +322,7 @@ if options.with_gtest:
 
     gtest_all_incs = '-I%s -I%s' % (path, os.path.join(path, 'include'))
     if platform == 'windows':
-        gtest_cflags = '/nologo /EHsc /Zi ' + gtest_all_incs
+        gtest_cflags = '/nologo /EHsc /Zi /D_VARIADIC_MAX=10 ' + gtest_all_incs
     else:
         gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs
     objs += n.build(built('gtest-all' + objext), 'cxx',

diff --git a/src/build_test.cc b/src/build_test.cc
index 2a0fa0f..1854387 100644 (file)
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -242,8 +242,8 @@ TEST_F(PlanTest, PoolsWithDepthTwo) {
 ));
   // Mark all the out* nodes dirty
   for (int i = 0; i < 3; ++i) {
-    GetNode("out" + string(1, '1' + i))->MarkDirty();
-    GetNode("outb" + string(1, '1' + i))->MarkDirty();
+    GetNode("out" + string(1, '1' + static_cast<char>(i)))->MarkDirty();
+    GetNode("outb" + string(1, '1' + static_cast<char>(i)))->MarkDirty();
   }
   GetNode("allTheThings")->MarkDirty();