summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--win/tclWin32Dll.c6
-rw-r--r--win/tclWinChan.c4
-rw-r--r--win/tclWinFCmd.c6
4 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7664c0d..e53755d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
'Tcl_GetIndexFromObj' discards qualifiers from pointer target type
* generic/tclWinInit.c: fix gcc warning: dereferencing pointer
'oemId' does break strict-aliasing rules
+ * win/tclWin32Dll.c: fix gcc warnings: unused variable 'registration'
+ * win/tclWinChan.c:
+ * win/tclWinFCmd.c:
2010-11-18 Donal K. Fellows <dkf@users.sf.net>
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 75fe3eb..dd48003 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.3 2010/09/08 15:42:13 dgp Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.54.2.4 2010/11/19 20:34:47 nijtmans Exp $
*/
#include "tclWinInt.h"
@@ -303,7 +303,7 @@ DllMain(
DWORD reason, /* Reason this function is being called. */
LPVOID reserved) /* Not used. */
{
-#ifdef HAVE_NO_SEH
+#if defined(HAVE_NO_SEH) && !defined(_WIN64)
EXCEPTION_REGISTRATION registration;
#endif
@@ -1054,7 +1054,7 @@ TclWinCPUID(
unsigned int index, /* Which CPUID value to retrieve. */
unsigned int *regsPtr) /* Registers after the CPUID. */
{
-#ifdef HAVE_NO_SEH
+#if defined(__GNUC__) && !defined(_WIN64)
EXCEPTION_REGISTRATION registration;
#endif
int status = TCL_ERROR;
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index a47202a..c0d3284 100644
--- a/win/tclWinChan.c
+++ b/win/tclWinChan.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: tclWinChan.c,v 1.49.4.3 2010/09/08 15:42:13 dgp Exp $
+ * RCS: @(#) $Id: tclWinChan.c,v 1.49.4.4 2010/11/19 20:34:47 nijtmans Exp $
*/
#include "tclWinInt.h"
@@ -1028,7 +1028,7 @@ Tcl_MakeFileChannel(
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/tclWinFCmd.c b/win/tclWinFCmd.c
index aa80297..deb022e 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.8.1 2010/09/08 15:42:13 dgp Exp $
+ * RCS: @(#) $Id: tclWinFCmd.c,v 1.52.8.2 2010/11/19 20:34:47 nijtmans Exp $
*/
#include "tclWinInt.h"
@@ -177,7 +177,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;
@@ -569,7 +569,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;