diff options
| author | Scott Graham <scottmg@chromium.org> | 2012-06-19 20:15:41 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2012-06-19 20:15:41 (GMT) |
| commit | 9ef56fd56f414bc6aa231b8d65cfa4ddec4cdedb (patch) | |
| tree | d7c8a502cfd62150aad0fd3848b8995f9b8ace79 /src | |
| parent | b3d63db1facc7ee9d14e211cc738f34b702de833 (diff) | |
| download | Ninja-9ef56fd56f414bc6aa231b8d65cfa4ddec4cdedb.zip Ninja-9ef56fd56f414bc6aa231b8d65cfa4ddec4cdedb.tar.gz Ninja-9ef56fd56f414bc6aa231b8d65cfa4ddec4cdedb.tar.bz2 | |
fix win32 compile, fix BuildLogTest.WriteRead on 2nd run
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_log_test.cc | 1 | ||||
| -rw-r--r-- | src/win32port.h | 2 |
2 files changed, 3 insertions, 0 deletions
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; |