From f7b38667eaff5909bf542e95cd9ef19144cab9b2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Aug 2015 04:14:11 +0200 Subject: [PATCH] No changes, just remove stray CRs from wxMSW wxGetOsVersion(). Commit 2b3633b3c040b277740cd1c8d4fdb998ebf900a0 somehow used incorrect EOLs for this file, see https://github.com/wxWidgets/wxWidgets/pull/62 --- src/msw/utils.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index aedbb78841..6bf4441701 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -1329,17 +1329,17 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin) bool wxCheckOsVersion(int majorVsn, int minorVsn) { - OSVERSIONINFOEX osvi = { sizeof(osvi), 0, 0, 0, 0, { 0 }, 0, 0 }; - DWORDLONG const dwlConditionMask = - ::VerSetConditionMask( - ::VerSetConditionMask( - 0, VER_MAJORVERSION, VER_GREATER_EQUAL), - VER_MINORVERSION, VER_GREATER_EQUAL); - - osvi.dwMajorVersion = majorVsn; - osvi.dwMinorVersion = minorVsn; - - return ::VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask) != FALSE; + OSVERSIONINFOEX osvi = { sizeof(osvi), 0, 0, 0, 0, { 0 }, 0, 0 }; + DWORDLONG const dwlConditionMask = + ::VerSetConditionMask( + ::VerSetConditionMask( + 0, VER_MAJORVERSION, VER_GREATER_EQUAL), + VER_MINORVERSION, VER_GREATER_EQUAL); + + osvi.dwMajorVersion = majorVsn; + osvi.dwMinorVersion = minorVsn; + + return ::VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, dwlConditionMask) != FALSE; } wxWinVersion wxGetWinVersion()