diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2014-02-08 07:41:17 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2014-02-08 07:41:17 (GMT) |
| commit | d69c1d382b201c00c4e0344695a302238394f170 (patch) | |
| tree | 4505f007fa376fabd602f450b526a4748635179f /unix | |
| parent | 14b32b82e117e3d6196985feca9750ad489f63cb (diff) | |
| parent | 40094302e01a514d976396f2bcca4fc6a2d4d297 (diff) | |
| download | tcl-d69c1d382b201c00c4e0344695a302238394f170.zip tcl-d69c1d382b201c00c4e0344695a302238394f170.tar.gz tcl-d69c1d382b201c00c4e0344695a302238394f170.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixInit.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index f8acad5..1617cba 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -865,16 +865,17 @@ TclpSetVariables( #ifdef __CYGWIN__ unameOK = 1; if (!osInfoInitialized) { - HANDLE handle = LoadLibraryW(L"NTDLL"); - int(*getversion)(void *) = (int(*)(void *))GetProcAddress(handle, "RtlGetVersion"); - osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - if (!getversion || getversion(&osInfo)) { - GetVersionExW(&osInfo); - } - if (handle) { - FreeLibrary(handle); - } - osInfoInitialized = 1; + HANDLE handle = LoadLibraryW(L"NTDLL"); + int(__stdcall *getversion)(void *) = + (int(__stdcall *)(void *))GetProcAddress(handle, "RtlGetVersion"); + osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + if (!getversion || getversion(&osInfo)) { + GetVersionExW(&osInfo); + } + if (handle) { + FreeLibrary(handle); + } + osInfoInitialized = 1; } GetSystemInfo(&sysInfo); |