fix win32 compile, fix BuildLogTest.WriteRead on 2nd run

3 files changed, 5 insertions, 2 deletions

diff --git a/configure.py b/configure.py
index 5329708..feb8a98 100755
--- a/configure.py
+++ b/configure.py
@@ -150,8 +150,8 @@ else:
 def shell_escape(str):
     """Escape str such that it's interpreted as a single argument by the shell."""
     # This isn't complete, but it's just enough to make NINJA_PYTHON work.
-    # TODO: do the appropriate thing for Windows-style cmd here, perhaps by
-    # just returning the input string.
+    if platform == 'windows':
+      return str
     if '"' in str:
         return "'%s'" % str.replace("'", "\\'")
     return str
diff --git a/src/build_log_test.cc b/src/build_log_test.cc
index 9fb42c9..8e73e6b 100644
--- a/src/build_log_test.cc
+++ b/src/build_log_test.cc
@@ -64,6 +64,7 @@ TEST_F(BuildLogTest, WriteRead) {
   ASSERT_TRUE(*e1 == *e2);
   ASSERT_EQ(15, e1->start_time);
   ASSERT_EQ("out", e1->output);
+  log2.Close();
 }
 
 TEST_F(BuildLogTest, FirstWriteAddsSignature) {
diff --git a/src/win32port.h b/src/win32port.h
index 8b42b38..3799af1 100644
--- a/src/win32port.h
+++ b/src/win32port.h
@@ -16,6 +16,8 @@
 #define NINJA_WIN32PORT_H_
 #pragma once
 
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
 /// A 64-bit integer type
 typedef signed long long int64_t;
 typedef unsigned long long uint64_t;