diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-23 08:30:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-23 08:30:10 (GMT) |
| commit | 5283ead87844e85153fa760d3dea4d0b7e4ae3d9 (patch) | |
| tree | 35190af2ab6a64b3e0843fa6756dd6e7cad2863f /win/tclWin32Dll.c | |
| parent | 385b6b0ee3f59311f025ee424c423167e94a9360 (diff) | |
| parent | 9215c2610ca2f4938aa0947bcbd1ecd19a8e5009 (diff) | |
| download | tcl-5283ead87844e85153fa760d3dea4d0b7e4ae3d9.zip tcl-5283ead87844e85153fa760d3dea4d0b7e4ae3d9.tar.gz tcl-5283ead87844e85153fa760d3dea4d0b7e4ae3d9.tar.bz2 | |
Re-base "stop-ce" branch to core-8-branch. This is what will be proposed for 8.7 in TIP #487.
Diffstat (limited to 'win/tclWin32Dll.c')
| -rw-r--r-- | win/tclWin32Dll.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 1d6cb2b..74e1d00 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -23,7 +23,6 @@ */ static HINSTANCE hInstance; /* HINSTANCE of this DLL. */ -static int platformId; /* Running under NT, or 95/98? */ /* * VC++ 5.x has no 'cpuid' assembler instruction, so we must emulate it @@ -186,18 +185,14 @@ TclWinInit( hInstance = hInst; os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); GetVersionExW(&os); - platformId = os.dwPlatformId; /* - * We no longer support Win32s or Win9x, so just in case someone manages - * to get a runtime there, make sure they know that. + * We no longer support Win32s or Win9x or Windows CE, so just in case + * someone manages to get a runtime there, make sure they know that. */ - if (platformId == VER_PLATFORM_WIN32s) { - Tcl_Panic("Win32s is not a supported platform"); - } - if (platformId == VER_PLATFORM_WIN32_WINDOWS) { - Tcl_Panic("Windows 9x is not a supported platform"); + if (os.dwPlatformId != VER_PLATFORM_WIN32_NT) { + Tcl_Panic("Windows NT is the only supported platform"); } TclWinResetInterfaces(); @@ -212,22 +207,19 @@ TclWinInit( * conditional code. * * Results: - * The return value is one of: - * VER_PLATFORM_WIN32s Win32s on Windows 3.1 (not supported) - * VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95, 98, ME (not supported) - * VER_PLATFORM_WIN32_NT Win32 on Windows NT, 2000, XP - * VER_PLATFORM_WIN32_CE Win32 on Windows CE + * The return value is: + * VER_PLATFORM_WIN32_NT Win32 on Windows NT, 2000, XP, 7, 8, 8.1, 10 * * Side effects: * None. * *---------------------------------------------------------------------- */ - +#undef TclWinGetPlatformId int TclWinGetPlatformId(void) { - return platformId; + return VER_PLATFORM_WIN32_NT; } /* |