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/tclWinFCmd.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/tclWinFCmd.c')
| -rw-r--r-- | win/tclWinFCmd.c | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index c940620..aa80297 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.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: tclWinFCmd.c,v 1.52 2006/08/29 00:36:57 coldstore Exp $ + * RCS: @(#) $Id: tclWinFCmd.c,v 1.52.8.1 2010/09/08 15:42:13 dgp Exp $ */ #include "tclWinInt.h" @@ -199,14 +199,7 @@ DoRenameFile( * arguments is a char block device. */ -#ifndef HAVE_NO_SEH - __try { - if ((*tclWinProcs->moveFileProc)(nativeSrc, nativeDst) != FALSE) { - retval = TCL_OK; - } - } __except (EXCEPTION_EXECUTE_HANDLER) {} -#else - +#if defined(HAVE_NO_SEH) && !defined(_WIN64) /* * Don't have SEH available, do things the hard way. Note that this needs * to be one block of asm, to avoid stack imbalance; also, it is illegal @@ -291,6 +284,16 @@ DoRenameFile( if (registration.status != FALSE) { retval = TCL_OK; } +#else +#ifndef HAVE_NO_SEH + __try { +#endif + if ((*tclWinProcs->moveFileProc)(nativeSrc, nativeDst) != FALSE) { + retval = TCL_OK; + } +#ifndef HAVE_NO_SEH + } __except (EXCEPTION_EXECUTE_HANDLER) {} +#endif #endif if (retval != -1) { @@ -587,14 +590,7 @@ DoCopyFile( * arguments is a char block device. */ -#ifndef HAVE_NO_SEH - __try { - if ((*tclWinProcs->copyFileProc)(nativeSrc, nativeDst, 0) != FALSE) { - retval = TCL_OK; - } - } __except (EXCEPTION_EXECUTE_HANDLER) {} -#else - +#if defined(HAVE_NO_SEH) && !defined(_WIN64) /* * Don't have SEH available, do things the hard way. Note that this needs * to be one block of asm, to avoid stack imbalance; also, it is illegal @@ -681,6 +677,16 @@ DoCopyFile( if (registration.status != FALSE) { retval = TCL_OK; } +#else +#ifndef HAVE_NO_SEH + __try { +#endif + if ((*tclWinProcs->copyFileProc)(nativeSrc, nativeDst, 0) != FALSE) { + retval = TCL_OK; + } +#ifndef HAVE_NO_SEH + } __except (EXCEPTION_EXECUTE_HANDLER) {} +#endif #endif if (retval != -1) { |