From: Danny Mayer <source@isc.org>
Date: Sat, 3 Aug 2002 01:36:24 +0000 (+0000)
Subject: Change isc_win32_version_check name to isc_win32_versioncheck and fix return value... 
X-Git-Tag: v9.2.3rc1~104^2~413
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=834aa905005dbfcddf68bf649402305a396a1fe8;p=thirdparty%2Fbind9.git

Change isc_win32_version_check name to isc_win32_versioncheck and fix return value to be as reported in the header
---

diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index 83460a91abb..63794565b9e 100644
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: win32os.h,v 1.1 2002/08/01 03:54:30 mayer Exp $ */
+/* $Id: win32os.h,v 1.2 2002/08/03 01:36:24 mayer Exp $ */
 
 #ifndef ISC_WIN32OS_H
 #define ISC_WIN32OS_H 1
@@ -54,7 +54,7 @@ isc_win32os_servicepackminor(void);
  */
 
 int
-isc_win32os_version_check(unsigned int major, unsigned int minor,
+isc_win32os_versioncheck(unsigned int major, unsigned int minor,
 		     unsigned int updatemajor, unsigned int updateminor);
 
 /*
diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index 15db08320ce..05ca09e354d 100644
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: win32os.c,v 1.1 2002/08/01 03:40:21 mayer Exp $ */
+/* $Id: win32os.c,v 1.2 2002/08/03 01:36:24 mayer Exp $ */
 
 #include <windows.h>
 
@@ -74,27 +74,27 @@ isc_win32os_servicepackminor(void) {
 }
 
 int
-isc_win32os_version_check(unsigned int major, unsigned int minor,
+isc_win32os_versioncheck(unsigned int major, unsigned int minor,
 		     unsigned int spmajor, unsigned int spminor) {
 
 	initialize_action();
 
 	if (major < isc_win32os_majorversion())
-		return (-1);
-	if (major > isc_win32os_majorversion())
 		return (1);
-	if (minor < isc_win32os_minorversion())
+	if (major > isc_win32os_majorversion())
 		return (-1);
-	if (minor > isc_win32os_minorversion())
+	if (minor < isc_win32os_minorversion())
 		return (1);
-	if (spmajor < isc_win32os_servicepackmajor())
+	if (minor > isc_win32os_minorversion())
 		return (-1);
-	if (spmajor > isc_win32os_servicepackmajor())
+	if (spmajor < isc_win32os_servicepackmajor())
 		return (1);
-	if (spminor < isc_win32os_servicepackminor())
+	if (spmajor > isc_win32os_servicepackmajor())
 		return (-1);
-	if (spminor > isc_win32os_servicepackminor())
+	if (spminor < isc_win32os_servicepackminor())
 		return (1);
+	if (spminor > isc_win32os_servicepackminor())
+		return (-1);
 
 	/* Exact */
 	return (0);