commit f117cc16f6ecf991d16737472f75f9328aa423f0
author Elliott Sales de Andrade <quantum.analyst@gmail.com> Sat Jul 01 03:49:59 2017 -0400
committer Elliott Sales de Andrade <quantum.analyst@gmail.com> Sat Sep 16 03:54:11 2017 -0400
tree 1aedffad51f4ec54a1c6fe7cdedc3abd6e718e97
parent d2bf82fef0535bc351a69392c0e0c5edc3aaf69f

Fix some Windows troubles.

Add parentheses so that constant does not overflow; include inttypes.h
when using MinGW to get the proper macros.

src/disk_interface.cc

diff --git a/src/disk_interface.cc b/src/disk_interface.cc
index f83151c..4b4c4c7 100644
--- a/src/disk_interface.cc
+++ b/src/disk_interface.cc
@@ -65,7 +65,7 @@
   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) {

src/win32port.h

diff --git a/src/win32port.h b/src/win32port.h
index 5464797..e542536 100644
--- a/src/win32port.h
+++ b/src/win32port.h
@@ -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