summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-20 14:38:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-20 14:38:08 (GMT)
commitc6900d988e939fafa1b1800ba27302c378d3e3c2 (patch)
tree7779bc8951689ba965bd2be88e9912bee7b40bd0
parent18b36e37e61e3936419af460b146f5c27e2d87f1 (diff)
downloadtcl-c6900d988e939fafa1b1800ba27302c378d3e3c2.zip
tcl-c6900d988e939fafa1b1800ba27302c378d3e3c2.tar.gz
tcl-c6900d988e939fafa1b1800ba27302c378d3e3c2.tar.bz2
Starting with Windows 8 DSK, GetVersionExA is deprecated
-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 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);