diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-02 08:27:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-10-02 08:27:06 (GMT) |
| commit | a656da49db4386d4dd04098720ee5fb4dbdd4ea5 (patch) | |
| tree | 94abb8a1944c2f2144501abe6ae75e26c2d838a5 | |
| parent | ee80cceb3a98489f174789095c0324e2ad2bade9 (diff) | |
| parent | aca14ebae96c83f1d9e2935ba51834a5d40d906e (diff) | |
| download | tk-a656da49db4386d4dd04098720ee5fb4dbdd4ea5.zip tk-a656da49db4386d4dd04098720ee5fb4dbdd4ea5.tar.gz tk-a656da49db4386d4dd04098720ee5fb4dbdd4ea5.tar.bz2 | |
Fix compilation with latest MinGW-w64 version 3.0: Conflict on EXCEPTION_REGISTRATION typedef, which means something completely different in MinGW-w64.
| -rw-r--r-- | win/tkWin32Dll.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/win/tkWin32Dll.c b/win/tkWin32Dll.c index b733f78..3c3d83a 100644 --- a/win/tkWin32Dll.c +++ b/win/tkWin32Dll.c @@ -17,17 +17,17 @@ /* * Unlike Borland and Microsoft, we don't register exception handlers by * pushing registration records onto the runtime stack. Instead, we register - * them by creating an EXCEPTION_REGISTRATION within the activation record. + * them by creating an TCLEXCEPTION_REGISTRATION within the activation record. */ -typedef struct EXCEPTION_REGISTRATION { - struct EXCEPTION_REGISTRATION *link; +typedef struct TCLEXCEPTION_REGISTRATION { + struct TCLEXCEPTION_REGISTRATION *link; EXCEPTION_DISPOSITION (*handler)( struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*); void *ebp; void *esp; int status; -} EXCEPTION_REGISTRATION; +} TCLEXCEPTION_REGISTRATION; /* * Need to add noinline flag to DllMain declaration so that gcc -O3 does not @@ -102,7 +102,7 @@ DllMain( LPVOID reserved) { #ifdef HAVE_NO_SEH - EXCEPTION_REGISTRATION registration; + TCLEXCEPTION_REGISTRATION registration; #endif /* @@ -127,7 +127,7 @@ DllMain( __asm__ __volatile__ ( /* - * Construct an EXCEPTION_REGISTRATION to protect the call to + * Construct an TCLEXCEPTION_REGISTRATION to protect the call to * TkFinalize */ @@ -141,7 +141,7 @@ DllMain( "movl %[error], 0x20(%%rdx)" "\n\t" /* status */ /* - * Link the EXCEPTION_REGISTRATION on the chain + * Link the TCLEXCEPTION_REGISTRATION on the chain */ "movq %%rdx, %%gs:0" "\n\t" @@ -154,7 +154,7 @@ DllMain( "call TkFinalize" "\n\t" /* - * Come here on a normal exit. Recover the EXCEPTION_REGISTRATION + * Come here on a normal exit. Recover the TCLEXCEPTION_REGISTRATION * and store a TCL_OK status */ @@ -164,7 +164,7 @@ DllMain( "jmp 2f" "\n" /* - * Come here on an exception. Get the EXCEPTION_REGISTRATION that + * Come here on an exception. Get the TCLEXCEPTION_REGISTRATION that * we previously put on the chain. */ @@ -174,7 +174,7 @@ DllMain( /* * Come here however we exited. Restore context from the - * EXCEPTION_REGISTRATION in case the stack is unbalanced. + * TCLEXCEPTION_REGISTRATION in case the stack is unbalanced. */ "2:" "\t" @@ -197,7 +197,7 @@ DllMain( __asm__ __volatile__ ( /* - * Construct an EXCEPTION_REGISTRATION to protect the call to + * Construct an TCLEXCEPTION_REGISTRATION to protect the call to * TkFinalize */ @@ -211,7 +211,7 @@ DllMain( "movl %[error], 0x10(%%edx)" "\n\t" /* status */ /* - * Link the EXCEPTION_REGISTRATION on the chain + * Link the TCLEXCEPTION_REGISTRATION on the chain */ "movl %%edx, %%fs:0" "\n\t" @@ -224,7 +224,7 @@ DllMain( "call _TkFinalize" "\n\t" /* - * Come here on a normal exit. Recover the EXCEPTION_REGISTRATION + * Come here on a normal exit. Recover the TCLEXCEPTION_REGISTRATION * and store a TCL_OK status */ @@ -234,7 +234,7 @@ DllMain( "jmp 2f" "\n" /* - * Come here on an exception. Get the EXCEPTION_REGISTRATION that + * Come here on an exception. Get the TCLEXCEPTION_REGISTRATION that * we previously put on the chain. */ @@ -245,7 +245,7 @@ DllMain( /* * Come here however we exited. Restore context from the - * EXCEPTION_REGISTRATION in case the stack is unbalanced. + * TCLEXCEPTION_REGISTRATION in case the stack is unbalanced. */ "2:" "\t" |