summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordavygrvy <davygrvy>2003-12-12 00:42:10 (GMT)
committerdavygrvy <davygrvy>2003-12-12 00:42:10 (GMT)
commitb48d0bec9dc1356cf8373e750c416d17de7f6e66 (patch)
tree11589ea40f52df7ac5291812ecd0a2b0df0058e4 /win
parentc86c9821eacbf9a7d07182ec547b433515e8c59f (diff)
downloadtk-b48d0bec9dc1356cf8373e750c416d17de7f6e66.zip
tk-b48d0bec9dc1356cf8373e750c416d17de7f6e66.tar.gz
tk-b48d0bec9dc1356cf8373e750c416d17de7f6e66.tar.bz2
Reverted to 1.15 for two reasons. 1) problem is best addressed in Tcl's
DllMain() and 2) needs a MinGW custom assembly implimentation as it doesn't understand SEH syntax.
Diffstat (limited to 'win')
-rw-r--r--win/winMain.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/win/winMain.c b/win/winMain.c
index 1f4392f..2d2b161 100644
--- a/win/winMain.c
+++ b/win/winMain.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: winMain.c,v 1.15.2.1 2003/12/11 03:32:05 davygrvy Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.15.2.2 2003/12/12 00:42:10 davygrvy Exp $
*/
#include <tk.h>
@@ -32,7 +32,7 @@
*/
static void setargv _ANSI_ARGS_((int *argcPtr, char ***argvPtr));
-static void WishPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *,format));
+static Tcl_PanicProc WishPanic;
#ifdef TK_TEST
extern int Tktest_Init(Tcl_Interp *interp);
@@ -239,12 +239,10 @@ WishPanic TCL_VARARGS_DEF(CONST char *,arg1)
MessageBeep(MB_ICONEXCLAMATION);
MessageBox(NULL, buf, "Fatal Error in Wish",
MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND);
+#ifdef _MSC_VER
DebugBreak();
- __try {
- ExitProcess(EXIT_FAILURE);
- } __except (EXCEPTION_EXECUTE_HANDLER) {
- TerminateProcess(GetCurrentProcess(), EXIT_FAILURE);
- }
+#endif
+ ExitProcess(1);
}
/*
*-------------------------------------------------------------------------