diff options
| author | Evan Martin <martine@danga.com> | 2012-07-17 20:20:12 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-07-17 20:20:12 (GMT) |
| commit | 039b662d52b10f3a45accc40e3c269676c664f7c (patch) | |
| tree | 301c3c0d944a1341c6bdf7f23d5cf284303ea60e /src | |
| parent | 5d8d27c3f078ec00efa97e9bbf0418825e8ff57f (diff) | |
| parent | 98d1b7b718de76831ddf4da283e6c0510266322b (diff) | |
| download | Ninja-039b662d52b10f3a45accc40e3c269676c664f7c.zip Ninja-039b662d52b10f3a45accc40e3c269676c664f7c.tar.gz Ninja-039b662d52b10f3a45accc40e3c269676c664f7c.tar.bz2 | |
Merge pull request #340 from sgraham/fix-win-build
fix win32 compile, fix BuildLogTest.WriteRead on 2nd run
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_log.cc | 1 | ||||
| -rw-r--r-- | src/win32port.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/build_log.cc b/src/build_log.cc index 02a9fb5..5eddf8f 100644 --- a/src/build_log.cc +++ b/src/build_log.cc @@ -235,6 +235,7 @@ bool BuildLog::Load(const string& path, string* err) { if (log_version < kOldestSupportedVersion) { *err = "unable to extract version from build log, perhaps due to " "being too old; you must clobber your build output and rebuild"; + fclose(file); return false; } } diff --git a/src/win32port.h b/src/win32port.h index 97bf817..ce3c949 100644 --- a/src/win32port.h +++ b/src/win32port.h @@ -15,6 +15,8 @@ #ifndef NINJA_WIN32PORT_H_ #define NINJA_WIN32PORT_H_ +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; |