summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-11-14 12:16:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-11-14 12:16:38 (GMT)
commit9b461748a00c4ac031b5c01d99daa9e1b9171f05 (patch)
tree2a17f77690a1fb26a786c58490bd803d2e8074b6 /win
parentfbc3a63f6c2f807d2181059be4b58e68e1791f00 (diff)
parent6e380ef6e9e2b4ccb24ded37f350f5dfcde61e50 (diff)
downloadtcl-9b461748a00c4ac031b5c01d99daa9e1b9171f05.zip
tcl-9b461748a00c4ac031b5c01d99daa9e1b9171f05.tar.gz
tcl-9b461748a00c4ac031b5c01d99daa9e1b9171f05.tar.bz2
merge trunk
Diffstat (limited to 'win')
-rw-r--r--win/tclWin32Dll.c4
-rw-r--r--win/tclWinTime.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 688fa8d..d8a8717 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -603,8 +603,8 @@ Tcl_WinTCharToUtf(
int
TclWinCPUID(
- unsigned int index, /* Which CPUID value to retrieve. */
- unsigned int *regsPtr) /* Registers after the CPUID. */
+ int index, /* Which CPUID value to retrieve. */
+ int *regsPtr) /* Registers after the CPUID. */
{
int status = TCL_ERROR;
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index 7b5c18a..f4e08fa 100644
--- a/win/tclWinTime.c
+++ b/win/tclWinTime.c
@@ -341,7 +341,7 @@ NativeGetTime(
*/
SYSTEM_INFO systemInfo;
- unsigned int regs[4];
+ int regs[4];
GetSystemInfo(&systemInfo);
if (TclWinCPUID(0, regs) == TCL_OK