diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2005-05-16 15:35:39 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2005-05-16 15:35:39 (GMT) |
| commit | 53781d7b887dd8f12daf4bdb95edace085a7db77 (patch) | |
| tree | f4a6689463df80c5de58b9969c11259f4c2c4745 | |
| parent | d4c50c252c9acddc971c4eb75838e311378565b9 (diff) | |
| download | tcl-53781d7b887dd8f12daf4bdb95edace085a7db77.zip tcl-53781d7b887dd8f12daf4bdb95edace085a7db77.tar.gz tcl-53781d7b887dd8f12daf4bdb95edace085a7db77.tar.bz2 | |
restore MSVC buildability of tclWin32Dll.c
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | win/tclWin32Dll.c | 8 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-05-15 Kevin Kenny <kennykb@users.sourceforge.net> + + * win/tclWin32Dll.c: conditioned definition of + EXCEPTION_REGISTRATION structures on HAVE_NO_SEH, to fix a bug in + buildability on MSVC. + 2005-05-14 Daniel Steffen <das@users.sourceforge.net> * generic/tclInt.decls: diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 25eb7b5..797cc53 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.43 2005/05/14 20:46:48 das Exp $ + * RCS: @(#) $Id: tclWin32Dll.c,v 1.44 2005/05/16 15:35:41 kennykb Exp $ */ #include "tclWinInt.h" @@ -288,7 +288,9 @@ DllMain(hInst, reason, reserved) DWORD reason; /* Reason this function is being called. */ LPVOID reserved; /* Not used. */ { +#ifdef HAVE_NO_SEH EXCEPTION_REGISTRATION registration; +#endif switch (reason) { case DLL_PROCESS_ATTACH: @@ -526,7 +528,9 @@ int TclpCheckStackSpace() { +#ifdef HAVE_NO_SEH EXCEPTION_REGISTRATION registration; +#endif int retval = 0; /* @@ -1047,7 +1051,9 @@ TclWinCPUID( unsigned int index, /* Which CPUID value to retrieve */ unsigned int * regsPtr ) /* Registers after the CPUID */ { +#ifdef HAVE_NO_SEH EXCEPTION_REGISTRATION registration; +#endif int status = TCL_ERROR; #if defined(__GNUC__) && !defined(_WIN64) |