1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00

Remove the OSVERSIONINFOEX code because there's no obvious way to

determine whether it'll compile before receiving the compile error.
Gah.

[originally from svn r1175]
This commit is contained in:
Simon Tatham 2001-08-07 08:42:17 +00:00
parent 94d35cead5
commit 4d3aad22f5

View File

@ -128,7 +128,7 @@ static char *window_name, *icon_name;
static int compose_state = 0; static int compose_state = 0;
static OSVERSIONINFOEX osVersion; static OSVERSIONINFO osVersion;
/* Dummy routine, only required in plink. */ /* Dummy routine, only required in plink. */
void ldisc_update(int echo, int edit) void ldisc_update(int echo, int edit)
@ -170,14 +170,11 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
{ {
ZeroMemory(&osVersion, sizeof(osVersion)); ZeroMemory(&osVersion, sizeof(osVersion));
osVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
if(!GetVersionEx ((OSVERSIONINFO *) &osVersion)) {
// If OSVERSIONINFOEX doesn't work, try OSVERSIONINFO.
osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); osVersion.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) if (!GetVersionEx ( (OSVERSIONINFO *) &osVersion)) {
return FALSE; MessageBox(NULL, "Windows refuses to report a version",
"PuTTY Fatal Error", MB_OK | MB_ICONEXCLAMATION);
return 1;
} }
} }