2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00

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

This commit is contained in:
Danny Mayer
2002-08-03 01:36:24 +00:00
parent 70406959df
commit 834aa90500
2 changed files with 12 additions and 12 deletions

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 #ifndef ISC_WIN32OS_H
#define ISC_WIN32OS_H 1 #define ISC_WIN32OS_H 1
@@ -54,7 +54,7 @@ isc_win32os_servicepackminor(void);
*/ */
int 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); unsigned int updatemajor, unsigned int updateminor);
/* /*

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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> #include <windows.h>
@@ -74,27 +74,27 @@ isc_win32os_servicepackminor(void) {
} }
int 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) { unsigned int spmajor, unsigned int spminor) {
initialize_action(); initialize_action();
if (major < isc_win32os_majorversion()) if (major < isc_win32os_majorversion())
return (-1); return (1);
if (major > isc_win32os_majorversion()) if (major > isc_win32os_majorversion())
return (1); return (-1);
if (minor < isc_win32os_minorversion()) if (minor < isc_win32os_minorversion())
return (-1); return (1);
if (minor > isc_win32os_minorversion()) if (minor > isc_win32os_minorversion())
return (1); return (-1);
if (spmajor < isc_win32os_servicepackmajor()) if (spmajor < isc_win32os_servicepackmajor())
return (-1); return (1);
if (spmajor > isc_win32os_servicepackmajor()) if (spmajor > isc_win32os_servicepackmajor())
return (1);
if (spminor < isc_win32os_servicepackminor())
return (-1); return (-1);
if (spminor > isc_win32os_servicepackminor()) if (spminor < isc_win32os_servicepackminor())
return (1); return (1);
if (spminor > isc_win32os_servicepackminor())
return (-1);
/* Exact */ /* Exact */
return (0); return (0);