From 09403328f62163ee041e3a3b273d5c69a31fc117 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Thu, 13 Dec 2018 18:48:14 -0500
Subject: [PATCH] Revert "Use newer versionHelper API if available"
This reverts commit 0aa247dbf22123ca93933aa4c6481e6b4f8fc64d.
---
src/sdl/i_main.c | 5 -----
src/sdl12/i_main.c | 5 -----
src/win32/win_main.c | 5 -----
3 files changed, 15 deletions(-)
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 4cae148f9f..9b951429f8 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -152,16 +152,11 @@ int main(int argc, char **argv)
// XP and Vista users can't use the newest exchndl.dll
// and older exchndl.dll won't work with release builds >= 2.1.21
// Check for >= Version 6.1 (>= Win7)
-#if defined(_INC_VERSIONHELPERS) || defined(_versionhelpers_H_INCLUDED_)
- if (IsWindows7OrGreater())
- LoadLibraryA("exchndl.dll");
-#else
DWORD winversion = GetVersion();
DWORD major = (DWORD)(LOBYTE(LOWORD(winversion)));
DWORD minor = (DWORD)(HIBYTE(LOWORD(winversion)));
if (major > 6 || (major == 6 && minor > 0))
LoadLibraryA("exchndl.dll");
-#endif
}
}
#ifndef __MINGW32__
diff --git a/src/sdl12/i_main.c b/src/sdl12/i_main.c
index 219c65213e..6494564d4b 100644
--- a/src/sdl12/i_main.c
+++ b/src/sdl12/i_main.c
@@ -221,16 +221,11 @@ int main(int argc, char **argv)
// XP and Vista users can't use the newest exchndl.dll
// and older exchndl.dll won't work with release builds >= 2.1.21
// Check for >= Version 6.1 (>= Win7)
-#if defined(_INC_VERSIONHELPERS) || defined(_versionhelpers_H_INCLUDED_)
- if (IsWindows7OrGreater())
- LoadLibraryA("exchndl.dll");
-#else
DWORD winversion = GetVersion();
DWORD major = (DWORD)(LOBYTE(LOWORD(winversion)));
DWORD minor = (DWORD)(HIBYTE(LOWORD(winversion)));
if (major > 6 || (major == 6 && minor > 0))
LoadLibraryA("exchndl.dll");
-#endif
}
}
#endif
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 06c17fe3fd..3da9e89ae6 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -668,16 +668,11 @@ int WINAPI WinMain (HINSTANCE hInstance,
// XP and Vista users can't use the newest exchndl.dll
// and older exchndl.dll won't work with release builds >= 2.1.21
// Check for >= Version 6.1 (Win7)
-#if defined(_INC_VERSIONHELPERS) || defined(_versionhelpers_H_INCLUDED_)
- if (IsWindows7OrGreater())
- LoadLibraryA("exchndl.dll");
-#else
DWORD winversion = GetVersion();
DWORD major = (DWORD)(LOBYTE(LOWORD(winversion)));
DWORD minor = (DWORD)(HIBYTE(LOWORD(winversion)));
if (major > 6 || (major == 6 && minor > 0))
LoadLibraryA("exchndl.dll");
-#endif
#if 0
}
#endif
--
GitLab