[mingw-tcl] rename EXCEPTION_REGISTRATION to avoid define clash with new mingw headers

[sailer]

commit 46cbdbf110bc15ba57b6f90b6200f23d7ab6ac91
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Tue Sep 17 22:22:30 2013 +0200

    rename EXCEPTION_REGISTRATION to avoid define clash with new mingw headers

 mingw-tcl.spec               |    5 +++++
 tcl-8.5.14-mingwexcept.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/mingw-tcl.spec b/mingw-tcl.spec
index 26f2bda..90a2c39 100644
--- a/mingw-tcl.spec
+++ b/mingw-tcl.spec
@@ -39,6 +39,7 @@ Patch2: tcl-8.5.14-hidden.patch
 Patch4: tcl-8.5.6-mingw.patch
 Patch5: tcl-nativetclsh.patch
 Patch6: tcl-mingw-w64-compatibility.patch
+Patch7: tcl-8.5.14-mingwexcept.patch
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
@@ -88,6 +89,7 @@ chmod -x generic/tclThreadAlloc.c
 %patch4 -p0 -b .mingw32
 %patch5 -p0 -b .nativetclsh
 %patch6 -p0 -b .mingw-w64
+%patch6 -p1 -b .mingw-except
 
 %build
 pushd win
@@ -195,6 +197,9 @@ mv $RPM_BUILD_ROOT/%{mingw64_libdir}/reg* $RPM_BUILD_ROOT/%{mingw64_libdir}/%{na
 %doc license.terms
 
 %changelog
+* Tue Sep 17 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 8.5.14-2
+- rename EXCEPTION_REGISTRATION to avoid define clash with new mingw headers
+
 * Tue Sep  3 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 8.5.14-1
 - update to 8.5.14
 
diff --git a/tcl-8.5.14-mingwexcept.patch b/tcl-8.5.14-mingwexcept.patch
new file mode 100644
index 0000000..ab3e1d6
--- /dev/null
+++ b/tcl-8.5.14-mingwexcept.patch
@@ -0,0 +1,38 @@
+--- tcl8.5.14/win/tclWin32Dll.c.x	2013-09-17 22:17:30.051486647 +0200
++++ tcl8.5.14/win/tclWin32Dll.c	2013-09-17 22:19:01.843373633 +0200
+@@ -53,14 +53,14 @@
+  * them by creating an EXCEPTION_REGISTRATION within the activation record.
+  */
+ 
+-typedef struct EXCEPTION_REGISTRATION {
+-    struct EXCEPTION_REGISTRATION *link;
++typedef struct TCL_EXCEPTION_REGISTRATION {
++    struct TCL_EXCEPTION_REGISTRATION *link;
+     EXCEPTION_DISPOSITION (*handler)(
+ 	    struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
+     void *ebp;
+     void *esp;
+     int status;
+-} EXCEPTION_REGISTRATION;
++} TCL_EXCEPTION_REGISTRATION;
+ #endif
+ 
+ /*
+@@ -302,7 +302,7 @@
+     LPVOID reserved)		/* Not used. */
+ {
+ #if defined(HAVE_NO_SEH) && !defined(_WIN64)
+-    EXCEPTION_REGISTRATION registration;
++    TCL_EXCEPTION_REGISTRATION registration;
+ #endif
+ 
+     switch (reason) {
+@@ -1086,7 +1086,7 @@
+ 
+ #   else
+ 
+-    EXCEPTION_REGISTRATION registration;
++    TCL_EXCEPTION_REGISTRATION registration;
+ 
+     /*
+      * Execute the CPUID instruction with the given index, and store results