Merge pull request #340 from sgraham/fix-win-build
authorEvan Martin <martine@danga.com>
Tue, 17 Jul 2012 20:20:12 +0000 (13:20 -0700)
committerEvan Martin <martine@danga.com>
Tue, 17 Jul 2012 20:20:12 +0000 (13:20 -0700)
fix win32 compile, fix BuildLogTest.WriteRead on 2nd run

1  2 
configure.py
src/win32port.h

diff --cc configure.py
Simple merge
diff --cc src/win32port.h
  
  #ifndef NINJA_WIN32PORT_H_
  #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;