gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnurl] 26/153: system_win32: fix version checking


From: gnunet
Subject: [GNUnet-SVN] [gnurl] 26/153: system_win32: fix version checking
Date: Tue, 11 Sep 2018 12:51:37 +0200

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit d0d48b42763ec8649196fbf7648ad9de0127dc27
Author: djelinski <address@hidden>
AuthorDate: Wed Jul 25 14:01:55 2018 +0200

    system_win32: fix version checking
    
    In the current version, VERSION_GREATER_THAN_EQUAL 6.3 will return false
    when run on windows 10.0. This patch addresses that error.
    
    Closes https://github.com/curl/curl/pull/2792
---
 lib/system_win32.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/system_win32.c b/lib/system_win32.c
index cfbbf3279..89d648516 100644
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -134,8 +134,9 @@ bool Curl_verify_windows_version(const unsigned int 
majorVersion,
       break;
 
     case VERSION_LESS_THAN_EQUAL:
-      if(osver.dwMajorVersion <= majorVersion &&
-         osver.dwMinorVersion <= minorVersion)
+      if(osver.dwMajorVersion < majorVersion ||
+        (osver.dwMajorVersion == majorVersion &&
+         osver.dwMinorVersion <= minorVersion))
         matched = TRUE;
       break;
 
@@ -146,8 +147,9 @@ bool Curl_verify_windows_version(const unsigned int 
majorVersion,
       break;
 
     case VERSION_GREATER_THAN_EQUAL:
-      if(osver.dwMajorVersion >= majorVersion &&
-         osver.dwMinorVersion >= minorVersion)
+      if(osver.dwMajorVersion > majorVersion ||
+        (osver.dwMajorVersion == majorVersion &&
+         osver.dwMinorVersion >= minorVersion))
         matched = TRUE;
       break;
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]