diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/tclWin32Dll.c | 2 | ||||
| -rw-r--r-- | win/tclWinChan.c | 2 | ||||
| -rw-r--r-- | win/tclWinDde.c | 2 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 4 |
5 files changed, 9 insertions, 6 deletions
@@ -5,7 +5,10 @@ * generic/tclFileName.c before winsock2.h, so make sure of that. * generic/tclIOUtil.c * generic/tclTest.c - * win/tclWinFile.c + * win/tclWin32Dll.c + * win/tclWinChan.c + * win/tclWinDde.c + * win/tclWinFCmd.c 2011-08-15 Don Porter <dgp@users.sourceforge.net> diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c index 4bfd046..ba3af7c 100644 --- a/win/tclWin32Dll.c +++ b/win/tclWin32Dll.c @@ -529,7 +529,7 @@ int TclpCheckStackSpace() { -#ifdef HAVE_NO_SEH +#if defined(HAVE_NO_SEH) && !defined(__WIN64__) EXCEPTION_REGISTRATION registration; #endif int retval = 0; diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 67a12a0..d06ff50 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -962,7 +962,7 @@ Tcl_MakeFileChannel(rawHandle, mode) int mode; /* ORed combination of TCL_READABLE and * TCL_WRITABLE to indicate file mode. */ { -#ifdef HAVE_NO_SEH +#if defined(HAVE_NO_SEH) && !defined(_WIN64) EXCEPTION_REGISTRATION registration; #endif char channelName[16 + TCL_INTEGER_SPACE]; diff --git a/win/tclWinDde.c b/win/tclWinDde.c index f5882c6..d180878 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -173,7 +173,7 @@ Initialize(void) if (ddeInstance == 0) { Tcl_MutexLock(&ddeMutex); if (ddeInstance == 0) { - if (DdeInitialize(&ddeInstance, DdeServerProc, + if (DdeInitialize(&ddeInstance, (PFNCALLBACK) DdeServerProc, CBF_SKIP_REGISTRATIONS | CBF_SKIP_UNREGISTRATIONS | CBF_FAIL_POKES, 0) diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index e0861f2..231e4b7 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -180,7 +180,7 @@ DoRenameFile( CONST TCHAR *nativeDst) /* New pathname for file or directory * (native). */ { -#ifdef HAVE_NO_SEH +#if defined(HAVE_NO_SEH) && !defined(_WIN64) EXCEPTION_REGISTRATION registration; #endif DWORD srcAttr, dstAttr; @@ -554,7 +554,7 @@ DoCopyFile( CONST TCHAR *nativeSrc, /* Pathname of file to be copied (native). */ CONST TCHAR *nativeDst) /* Pathname of file to copy to (native). */ { -#ifdef HAVE_NO_SEH +#if defined(HAVE_NO_SEH) && !defined(_WIN64) EXCEPTION_REGISTRATION registration; #endif int retval = -1; |