Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(324)

Unified Diff: Source/platform/win/SystemInfo.cpp

Issue 732673002: Fix 8.1 sdk detection defines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix order of includes so that defines are actually defined Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/win/SystemInfo.cpp
diff --git a/Source/platform/win/SystemInfo.cpp b/Source/platform/win/SystemInfo.cpp
index fff9ccfc283d22b8292ff27834a91d4037cc40ab..61abff120881b95487db290f40df0f0e1552f705 100644
--- a/Source/platform/win/SystemInfo.cpp
+++ b/Source/platform/win/SystemInfo.cpp
@@ -26,25 +26,25 @@
#include "config.h"
#include "platform/win/SystemInfo.h"
-#if _WIN32_WINNT_WINBLUE
+#include <windows.h>
+
+#if _WIN32_WINNT >= 0x0603
#include <versionhelpers.h>
#endif
-#include <windows.h>
-
namespace blink {
-#ifndef _WIN32_WINNT_WINBLUE
+#if _WIN32_WINNT < 0x0603
static bool IsWindowsVistaOrGreater()
{
OSVERSIONINFOEXW osvi = { };
osvi.dwOSVersionInfoSize = sizeof(osvi);
osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_VISTA);
osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_VISTA);
- DWORDLONG conditoin = 0;
- VER_SET_CONDITION(conditoin, VER_MAJORVERSION, VER_GREATER_EQUAL);
- VER_SET_CONDITION(conditoin, VER_MINORVERSION, VER_GREATER_EQUAL);
- return !!::VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION, conditoin);
+ DWORDLONG condition = 0;
+ VER_SET_CONDITION(condition, VER_MAJORVERSION, VER_GREATER_EQUAL);
+ VER_SET_CONDITION(condition, VER_MINORVERSION, VER_GREATER_EQUAL);
+ return !!::VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION, condition);
}
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698