summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-11-20 14:40:38 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-11-20 14:40:38 (GMT)
commitb06a66764fa9137d7b35872879da7dd0c533a578 (patch)
treef3e0cf5d5f02ffc908c50be5aaf61e54ceeb66f3
parent740aae200c1da34ac7e93db3c0dfbc7005b67a7e (diff)
parent98a52fd9b4143d23cde953c8ba3efd87f0d7004e (diff)
downloadtcl-b06a66764fa9137d7b35872879da7dd0c533a578.zip
tcl-b06a66764fa9137d7b35872879da7dd0c533a578.tar.gz
tcl-b06a66764fa9137d7b35872879da7dd0c533a578.tar.bz2
Starting with Windows 8 DSK, GetVersionExA is deprecated
FossilOrigin-Name: bd84c74e43404a3b80acd8f018cb839e2d29b926
-rw-r--r--win/tclWin32Dll.c6
-rw-r--r--win/tclWinInit.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index a72b760..634e1d2 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -181,11 +181,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 d82944e..7b027c5 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -530,7 +530,7 @@ TclpSetVariables(
SYSTEM_INFO info;
OemId oemId;
} sys;
- OSVERSIONINFOA osInfo;
+ OSVERSIONINFOW osInfo;
Tcl_DString ds;
TCHAR szUserName[UNLEN+1];
DWORD cchUserNameLen = UNLEN;
@@ -538,8 +538,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);