diff options
Diffstat (limited to 'generic/tclPanic.c')
| -rw-r--r-- | generic/tclPanic.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/generic/tclPanic.c b/generic/tclPanic.c index 6ef39e1..9aa0627 100644 --- a/generic/tclPanic.c +++ b/generic/tclPanic.c @@ -12,16 +12,11 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPanic.c,v 1.18 2010/12/16 08:52:37 nijtmans Exp $ + * RCS: @(#) $Id: tclPanic.c,v 1.15 2010/12/01 10:43:36 nijtmans Exp $ */ #include "tclInt.h" -#ifdef _WIN32 -# ifdef _MSC_VER -# include <intrin.h> -# endif - MODULE_SCOPE void tclWinDebugPanic(const char *format, ...); -#endif +#undef Tcl_Panic /* * The panicProc variable contains a pointer to an application specific panic @@ -50,10 +45,6 @@ void Tcl_SetPanicProc( Tcl_PanicProc *proc) { -#ifdef _WIN32 - /* tclWinDebugPanic only installs if there is no panicProc yet. */ - if ((proc != tclWinDebugPanic) || (panicProc == NULL)) -#endif panicProc = proc; } @@ -94,27 +85,18 @@ Tcl_PanicVA( if (panicProc != NULL) { panicProc(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); -#ifdef _WIN32 - } else if (IsDebuggerPresent()) { - tclWinDebugPanic(format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); -#endif } else { fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8); fprintf(stderr, "\n"); fflush(stderr); - } - /* In case the users panic proc does not abort, we do it here */ #ifdef _WIN32 -# ifdef __GNUC__ - __builtin_trap(); -# elif _MSC_VER - __debugbreak(); -# endif + DebugBreak(); ExitProcess(1); #else - abort(); + abort(); #endif + } } /* |