diff --git a/configure.py b/configure.py
index fe04c61d02..78cd1deb0d 100755
--- a/configure.py
+++ b/configure.py
@@ -554,7 +554,7 @@ def has_re2c():
 n.comment('Tests all build into ninja_test executable.')
 
 objs = []
-if platform.is_windows():
+if platform.is_msvc():
     cxxvariables = [('pdb', 'ninja_test.pdb')]
 
 for name in ['build_log_test',
diff --git a/src/deps_log.cc b/src/deps_log.cc
index be5a3e0b1e..0bb96f3759 100644
--- a/src/deps_log.cc
+++ b/src/deps_log.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 #ifndef _WIN32
 #include <unistd.h>
-#elif (_MSC_VER < 1900)
+#elif defined(_MSC_VER) && (_MSC_VER < 1900)
 typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 #endif