diff options
author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-11-20 14:38:08 (GMT) |
---|---|---|
committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-11-20 14:38:08 (GMT) |
commit | 98a52fd9b4143d23cde953c8ba3efd87f0d7004e (patch) | |
tree | 7779bc8951689ba965bd2be88e9912bee7b40bd0 | |
parent | 72ec21074b80a70322db067debb12b0d5a466c60 (diff) | |
download | tcl-98a52fd9b4143d23cde953c8ba3efd87f0d7004e.zip tcl-98a52fd9b4143d23cde953c8ba3efd87f0d7004e.tar.gz tcl-98a52fd9b4143d23cde953c8ba3efd87f0d7004e.tar.bz2 |
Starting with Windows 8 DSK, GetVersionExA is deprecated
FossilOrigin-Name: 450e7bd007c96cb4219be1b432ef215b61fc2efa
-rw-r--r-- | win/tclWin32Dll.c | 6 | ||||
-rw-r--r-- | win/tclWinInit.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 2cb7d7c..e5e5202 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -432,11 +432,11 @@ void TclWinInit( HINSTANCE hInst) /* Library instance handle. */ { - OSVERSIONINFO os; + OSVERSIONINFOW os; hInstance = hInst; - os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&os); + os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&os); platformId = os.dwPlatformId; /* diff --git a/win/tclWinInit.c b/win/tclWinInit.c index 5baf020..81d762f 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -563,7 +563,7 @@ TclpSetVariables( SYSTEM_INFO info; OemId oemId; } sys; - OSVERSIONINFOA osInfo; + OSVERSIONINFOW osInfo; Tcl_DString ds; WCHAR szUserName[UNLEN+1]; DWORD cchUserNameLen = UNLEN; @@ -571,8 +571,8 @@ TclpSetVariables( Tcl_SetVar2Ex(interp, "tclDefaultLibrary", NULL, TclGetProcessGlobalValue(&defaultLibraryDir), TCL_GLOBAL_ONLY); - osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - GetVersionExA(&osInfo); + osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW(&osInfo); GetSystemInfo(&sys.info); |