Permalink
Browse files

Fix some Windows troubles.

Add parentheses so that constant does not overflow; include inttypes.h
when using MinGW to get the proper macros.
  • Loading branch information...
QuLogic committed Jul 1, 2017
1 parent d2bf82f commit f117cc16f6ecf991d16737472f75f9328aa423f0
Showing with 8 additions and 1 deletion.
  1. +1 −1 src/disk_interface.cc
  2. +7 −0 src/win32port.h
View
@@ -65,7 +65,7 @@ TimeStamp TimeStampFromFileTime(const FILETIME& filetime) {
uint64_t mtime = ((uint64_t)filetime.dwHighDateTime << 32) |
((uint64_t)filetime.dwLowDateTime);
// 1600 epoch -> 2000 epoch (subtract 400 years).
return (TimeStamp)mtime - 12622770400LL * 1000000000LL / 100;
return (TimeStamp)mtime - 12622770400LL * (1000000000LL / 100);
}
TimeStamp StatSingleFile(const string& path, string* err) {
View
@@ -15,6 +15,13 @@
#ifndef NINJA_WIN32PORT_H_
#define NINJA_WIN32PORT_H_
#if defined(__MINGW32__) || defined(__MINGW64__)
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
#include <inttypes.h>
#endif
typedef signed short int16_t;
typedef unsigned short uint16_t;
/// A 64-bit integer type

0 comments on commit f117cc1

Please sign in to comment.