From d4474e195e21ebc935958a32f945d7ddff087ea4 Mon Sep 17 00:00:00 2001 From: kristopher tate Date: Sat, 1 Sep 2018 12:02:04 +0900 Subject: i#1438: src/windows_sdk.cpp: fix version guard in `find_10_version`; --- src/windows_sdk.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/windows_sdk.cpp') diff --git a/src/windows_sdk.cpp b/src/windows_sdk.cpp index 0f9d0fc301..a63ccceb75 100644 --- a/src/windows_sdk.cpp +++ b/src/windows_sdk.cpp @@ -204,7 +204,11 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) { // https://developer.microsoft.com/en-us/windows/downloads/sdk-archive c2 = 26624; } - if ((c0 > v0) || (c1 > v1) || (c2 > v2) || (c3 > v3)) { + + if ( (c0 > v0) + || (c0 == v0 && c1 > v1) + || (c0 == v0 && c1 == v1 && c2 > v2) + || (c0 == v0 && c1 == v1 && c2 == v2 && c3 > v3) ) { v0 = c0, v1 = c1, v2 = c2, v3 = c3; free((void*)priv->base.version10_ptr); priv->base.version10_ptr = strdup(ffd.cFileName); -- cgit v1.2.3 From 9e6f53dd5857d04294f8bed3fe2b3dde75196756 Mon Sep 17 00:00:00 2001 From: kristopher tate Date: Sat, 1 Sep 2018 12:02:21 +0900 Subject: i#1438: src/windows_sdk.cpp: fix version guard in `find_81_version`; --- src/windows_sdk.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/windows_sdk.cpp') diff --git a/src/windows_sdk.cpp b/src/windows_sdk.cpp index a63ccceb75..c6e79f85cd 100644 --- a/src/windows_sdk.cpp +++ b/src/windows_sdk.cpp @@ -248,7 +248,8 @@ static ZigFindWindowsSdkError find_81_version(ZigWindowsSDKPrivate *priv) { if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { int c0 = 0, c1 = 0; sscanf(ffd.cFileName, "winv%d.%d", &c0, &c1); - if ((c0 > v0) || (c1 > v1)) { + + if ( (c0 > v0) || (c0 == v0 && c1 > v1) ) { v0 = c0, v1 = c1; free((void*)priv->base.version81_ptr); priv->base.version81_ptr = strdup(ffd.cFileName); -- cgit v1.2.3