summaryrefslogtreecommitdiffstats
path: root/src/disk_interface.cc
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-11-24 17:37:47 (GMT)
committerNico Weber <thakis@chromium.org>2014-11-24 17:37:47 (GMT)
commit3309498174411e02e7680ea8b470bb7d1d70bdb8 (patch)
tree2c84adc7263350e6929dca36d778ea7e29fe5cc5 /src/disk_interface.cc
parent85e13c163d0129216fb382df6a53d11393c4c0c2 (diff)
parentb532cab080bbde2068ab49aba814c7176111681f (diff)
downloadNinja-3309498174411e02e7680ea8b470bb7d1d70bdb8.zip
Ninja-3309498174411e02e7680ea8b470bb7d1d70bdb8.tar.gz
Ninja-3309498174411e02e7680ea8b470bb7d1d70bdb8.tar.bz2
v1.5.3v1.5.3
Diffstat (limited to 'src/disk_interface.cc')
-rw-r--r--src/disk_interface.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/disk_interface.cc b/src/disk_interface.cc
index b170f63..9810708 100644
--- a/src/disk_interface.cc
+++ b/src/disk_interface.cc
@@ -82,16 +82,20 @@ TimeStamp StatSingleFile(const string& path, bool quiet) {
return TimeStampFromFileTime(attrs.ftLastWriteTime);
}
+#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4996) // GetVersionExA is deprecated post SDK 8.1.
+#endif
bool IsWindows7OrLater() {
OSVERSIONINFO version_info = { sizeof(version_info) };
if (!GetVersionEx(&version_info))
Fatal("GetVersionEx: %s", GetLastErrorString().c_str());
return version_info.dwMajorVersion > 6 ||
- version_info.dwMajorVersion == 6 && version_info.dwMinorVersion >= 1;
+ (version_info.dwMajorVersion == 6 && version_info.dwMinorVersion >= 1);
}
+#ifdef _MSC_VER
#pragma warning(pop)
+#endif
bool StatAllFilesInDir(const string& dir, map<string, TimeStamp>* stamps,
bool quiet) {