diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2005-06-06 20:54:09 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2005-06-06 20:54:09 (GMT) |
| commit | 6580b2352407aa1b0f314552899f301558bc3113 (patch) | |
| tree | 49699ded2cef84afdcc20be391bea9b95f1dcaf7 /win | |
| parent | abc82372fd122d714d3c5f3156072479f1a77c45 (diff) | |
| download | tcl-6580b2352407aa1b0f314552899f301558bc3113.zip tcl-6580b2352407aa1b0f314552899f301558bc3113.tar.gz tcl-6580b2352407aa1b0f314552899f301558bc3113.tar.bz2 | |
Correct crash in stack.test on gcc/win32; fix compile errors in tclObj.c on hpux/native cc
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWin32Dll.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 797cc53..0fe1b52 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -9,7 +9,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.44 2005/05/16 15:35:41 kennykb Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.45 2005/06/06 20:54:18 kennykb Exp $ */ #include "tclWinInt.h" @@ -37,15 +37,6 @@ typedef VOID (WINAPI UTUNREGISTER)(HANDLE hModule); static HINSTANCE hInstance; /* HINSTANCE of this DLL. */ static int platformId; /* Running under NT, or 95/98? */ -#if defined(HAVE_NO_SEH) && defined(TCL_MEM_DEBUG) -static void *INITIAL_ESP, - *INITIAL_EBP, - *INITIAL_HANDLER, - *RESTORED_ESP, - *RESTORED_EBP, - *RESTORED_HANDLER; -#endif /* HAVE_NO_SEH && TCL_MEM_DEBUG */ - #ifdef HAVE_NO_SEH /* @@ -328,7 +319,7 @@ DllMain(hInst, reason, reserved) /* * Call Tcl_Finalize */ - "call %[Tcl_Finalize]" "\n\t" + "call _Tcl_Finalize" "\n\t" /* * Come here on a normal exit. Recover the EXCEPTION_REGISTRATION @@ -365,7 +356,6 @@ DllMain(hInst, reason, reserved) /* No outputs */ : [registration] "m" (registration), - [Tcl_Finalize] "m" (Tcl_Finalize), [ok] "i" (TCL_OK), [error] "i" (TCL_ERROR) : @@ -602,7 +592,6 @@ TclpCheckStackSpace() /* No outputs */ : [registration] "m" (registration), - [Tcl_Finalize] "m" (Tcl_Finalize), [ok] "i" (TCL_OK), [error] "i" (TCL_ERROR), [size] "i" (TCL_WIN_STACK_THRESHOLD) |