summaryrefslogtreecommitdiff
path: root/zen/win_ver.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:07 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:20:07 +0200
commit88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170 (patch)
treec6c5babb49b90293380106b81ae5c446959ac70f /zen/win_ver.h
parent5.3 (diff)
downloadFreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.gz
FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.tar.bz2
FreeFileSync-88a8b528e20013c0aa3cc6bcd9659b0b5ddd9170.zip
5.4
Diffstat (limited to 'zen/win_ver.h')
-rw-r--r--zen/win_ver.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/zen/win_ver.h b/zen/win_ver.h
index c2162c61..3a6f23c1 100644
--- a/zen/win_ver.h
+++ b/zen/win_ver.h
@@ -7,7 +7,7 @@
#ifndef WINDOWS_VERSION_HEADER_238470348254325
#define WINDOWS_VERSION_HEADER_238470348254325
-#include "win.h"
+#include <zen/win.h> //includes "windows.h"
namespace zen
{
@@ -44,8 +44,7 @@ bool winXyOrLater(DWORD major, DWORD minor)
OSVERSIONINFO osvi = {};
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
if (::GetVersionEx(&osvi)) //38 ns per call! (yes, that's nano!) -> we do NOT miss C++11 thread safe statics right now...
- return osvi.dwMajorVersion > major ||
- (osvi.dwMajorVersion == major && osvi.dwMinorVersion >= minor);
+ return osvi.dwMajorVersion != major ? osvi.dwMajorVersion > major : osvi.dwMinorVersion >= minor;
return false;
}
}
bgstack15