diff options
author | dgp <dgp@users.sourceforge.net> | 2007-11-16 07:20:49 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2007-11-16 07:20:49 (GMT) |
commit | 98f0d1a3406ed99293cd6bb505ccd29063208ce5 (patch) | |
tree | 91c4790b7f459c9347f152a95205730c4119ff6c /win | |
parent | 55e6c0333341b101e68407be7eebe42f829c9f33 (diff) | |
download | tcl-98f0d1a3406ed99293cd6bb505ccd29063208ce5.zip tcl-98f0d1a3406ed99293cd6bb505ccd29063208ce5.tar.gz tcl-98f0d1a3406ed99293cd6bb505ccd29063208ce5.tar.bz2 |
merge updates from HEAD
Diffstat (limited to 'win')
-rw-r--r-- | win/tclWin32Dll.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 76aab7c..ebd43ba 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWin32Dll.c,v 1.48.8.1 2007/11/12 19:18:24 dgp Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.48.8.2 2007/11/16 07:20:58 dgp Exp $ */ #include "tclWinInt.h" @@ -554,7 +554,7 @@ TclpGetCStackParams( * area in which the stack resides */ if (!tsdPtr->stackBound - || ((DWORD_PTR)&tsdPtr < (DWORD_PTR)tsdPtr->stackBound)) { + || ((UINT_PTR)&tsdPtr < (UINT_PTR)tsdPtr->stackBound)) { /* * Either we haven't determined the stack bound in this thread, @@ -574,8 +574,8 @@ TclpGetCStackParams( if (!tsdPtr->stackBound) { tsdPtr->stackBound = - (int*) ((DWORD_PTR)(&tsdPtr) - & ~ (DWORD_PTR)(si.dwPageSize - 1)); + (int*) ((UINT_PTR)(&tsdPtr) + & ~ (UINT_PTR)(si.dwPageSize - 1)); } } else { @@ -587,8 +587,8 @@ TclpGetCStackParams( */ tsdPtr->stackBound = - (int*) ((DWORD_PTR)(mbi.AllocationBase) - + (DWORD_PTR)(si.dwPageSize) + (int*) ((UINT_PTR)(mbi.AllocationBase) + + (UINT_PTR)(si.dwPageSize) + TCL_WIN_STACK_THRESHOLD); } } |