From 43f5af556d952a73a0ac98f085393ff9fffdcdc4 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 2 Apr 2016 11:24:07 -0700 Subject: [PATCH] Switch back to GetVersionEx() to avoid depending on the win8 SDK just for VersionHelpers.h --- libaegisub/windows/fs.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libaegisub/windows/fs.cpp b/libaegisub/windows/fs.cpp index 697decb85..5c2a2385f 100644 --- a/libaegisub/windows/fs.cpp +++ b/libaegisub/windows/fs.cpp @@ -30,13 +30,19 @@ namespace bfs = boost::filesystem; #define WIN32_LEAN_AND_MEAN #include -#include #undef CreateDirectory namespace { FINDEX_INFO_LEVELS find_info_level() { - return IsWindows7OrGreater() ? FindExInfoBasic : FindExInfoStandard; + OSVERSIONINFO osvi = {}; + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + + if (osvi.dwMajorVersion > 6 || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion >= 1)) + return FindExInfoBasic; + else + return FindExInfoStandard; } }