@@ -313,7 +313,6 @@ set(SOURCE_FILES

     src/compat/compat-dirname.c

     src/compat/compat-gettimeofday.c

     src/compat/compat-strsep.c

-    src/compat/compat-versionhelpers.h

     src/openvpn/argv.c

     src/openvpn/argv.h

     src/openvpn/base64.c

@@ -374,9 +374,6 @@ don't. */

 /* Define to 1 if you have the <valgrind/memcheck.h> header file. */

 #undef HAVE_VALGRIND_MEMCHECK_H

-/* Define to 1 if you have the <versionhelpers.h> header file. */

-#undef HAVE_VERSIONHELPERS_H

-

 /* Define to 1 if you have the `vfork' function. */

 #undef HAVE_VFORK

@@ -454,7 +454,6 @@ AC_CHECK_HEADERS([ \

 	unistd.h dlfcn.h \

 	netinet/in.h netinet/in_systm.h \

 	netinet/tcp.h arpa/inet.h netdb.h \

-	versionhelpers.h \

 ])

 AC_CHECK_HEADERS([ \

 	sys/time.h sys/ioctl.h sys/stat.h \

@@ -20,5 +20,4 @@ libcompat_la_SOURCES = \

 	compat-basename.c \

 	compat-gettimeofday.c \

 	compat-daemon.c \

-	compat-strsep.c \

-	compat-versionhelpers.h

+	compat-strsep.c

\ No newline at end of file

deleted file mode 100644

@@ -1,116 +0,0 @@

-/**

- * This file is part of the mingw-w64 runtime package.

- * No warranty is given; refer to the file DISCLAIMER within this package.

- */

-

-#ifndef _INC_VERSIONHELPERS

-#define _INC_VERSIONHELPERS

-

-#include <winapifamily.h>

-

-#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(__WIDL__)

-

-#ifdef __cplusplus

-#define VERSIONHELPERAPI inline bool

-#else

-#define VERSIONHELPERAPI FORCEINLINE BOOL

-#endif

-

-#define _WIN32_WINNT_WINBLUE    0x0603

-

-#ifndef _WIN32_WINNT_WINTHRESHOLD

-#define _WIN32_WINNT_WINTHRESHOLD    0x0A00 /* Windows 10 */

-#endif

-

-VERSIONHELPERAPI

-IsWindowsVersionOrGreater(WORD major, WORD minor, WORD servpack)

-{

-    OSVERSIONINFOEXW vi = {sizeof(vi), major, minor, 0, 0, {0}, servpack};

-    return VerifyVersionInfoW(&vi, VER_MAJORVERSION|VER_MINORVERSION|VER_SERVICEPACKMAJOR,

-                              VerSetConditionMask(VerSetConditionMask(VerSetConditionMask(0,

-                                                                                          VER_MAJORVERSION, VER_GREATER_EQUAL),

-                                                                      VER_MINORVERSION, VER_GREATER_EQUAL),

-                                                  VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL));

-}

-

-VERSIONHELPERAPI

-IsWindowsXPOrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 0);

-}

-

-VERSIONHELPERAPI

-IsWindowsXPSP1OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 1);

-}

-

-VERSIONHELPERAPI

-IsWindowsXPSP2OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 2);

-}

-

-VERSIONHELPERAPI

-IsWindowsXPSP3OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINXP), LOBYTE(_WIN32_WINNT_WINXP), 3);

-}

-

-VERSIONHELPERAPI

-IsWindowsVistaOrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 0);

-}

-

-VERSIONHELPERAPI

-IsWindowsVistaSP1OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 1);

-}

-

-VERSIONHELPERAPI

-IsWindowsVistaSP2OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), LOBYTE(_WIN32_WINNT_VISTA), 2);

-}

-

-VERSIONHELPERAPI

-IsWindows7OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 0);

-}

-

-VERSIONHELPERAPI

-IsWindows7SP1OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), LOBYTE(_WIN32_WINNT_WIN7), 1);

-}

-

-VERSIONHELPERAPI

-IsWindows8OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), LOBYTE(_WIN32_WINNT_WIN8), 0);

-}

-

-VERSIONHELPERAPI

-IsWindows8Point1OrGreater(void)

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINBLUE), LOBYTE(_WIN32_WINNT_WINBLUE), 0);

-}

-

-VERSIONHELPERAPI

-IsWindows10OrGreater()

-{

-    return IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINTHRESHOLD), LOBYTE(_WIN32_WINNT_WINTHRESHOLD), 0);

-}

-

-VERSIONHELPERAPI

-IsWindowsServer(void)

-{

-    OSVERSIONINFOEXW vi = {sizeof(vi), 0, 0, 0, 0, {0}, 0, 0, 0, VER_NT_WORKSTATION};

-    return !VerifyVersionInfoW(&vi, VER_PRODUCT_TYPE, VerSetConditionMask(0, VER_PRODUCT_TYPE, VER_EQUAL));

-}

-

-#endif /* if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(__WIDL__) */

-#endif /* ifndef _INC_VERSIONHELPERS */

@@ -45,11 +45,7 @@

 #include "memdbg.h"

-#ifdef HAVE_VERSIONHELPERS_H

 #include <versionhelpers.h>

-#else

-#include "compat-versionhelpers.h"

-#endif

 #include "block_dns.h"

@@ -34,11 +34,7 @@

 #include <shellapi.h>

 #include <mstcpip.h>

-#ifdef HAVE_VERSIONHELPERS_H

 #include <versionhelpers.h>

-#else

-#include "compat-versionhelpers.h"

-#endif

 #include "openvpn-msg.h"

 #include "validate.h"