diff options
| author | dgp <dgp@users.sourceforge.net> | 2010-09-08 15:42:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2010-09-08 15:42:12 (GMT) |
| commit | d39e6a5c3d589c46796ee1ec9a69d5a19e31a466 (patch) | |
| tree | c53c8f835a3f9568d4e81597d05d80d2299da593 /win/tclWin32Dll.c | |
| parent | 3c5c0386e0a63f34a79ce78f5d35c48599949508 (diff) | |
| download | tcl-d39e6a5c3d589c46796ee1ec9a69d5a19e31a466.zip tcl-d39e6a5c3d589c46796ee1ec9a69d5a19e31a466.tar.gz tcl-d39e6a5c3d589c46796ee1ec9a69d5a19e31a466.tar.bz2 | |
* win/tclWin32Dll.c: #ifdef protections to permit builds with
* win/tclWinChan.c: mingw on amd64 systems. Thanks to "mescalinum"
* win/tclWinFCmd.c: for reporting and testing.
Diffstat (limited to 'win/tclWin32Dll.c')
| -rw-r--r-- | win/tclWin32Dll.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 1913204..75fe3eb 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.54.2.2 2010/08/04 19:17:29 hobbs Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.54.2.3 2010/09/08 15:42:13 dgp Exp $ */ #include "tclWinInt.h" @@ -319,7 +319,7 @@ DllMain( * an exception handler and the state of the stack might be unstable. */ -#ifdef HAVE_NO_SEH +#if defined(HAVE_NO_SEH) && !defined(_WIN64) __asm__ __volatile__ ( /* @@ -389,13 +389,17 @@ DllMain( "%eax", "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory" ); -#else /* HAVE_NO_SEH */ +#else +#ifndef HAVE_NO_SEH __try { +#endif Tcl_Finalize(); +#ifndef HAVE_NO_SEH } __except (EXCEPTION_EXECUTE_HANDLER) { /* empty handler body. */ } #endif +#endif break; } |