diff options
| author | cvs2fossil <cvs2fossil> | 2010-12-17 17:55:45 (GMT) |
|---|---|---|
| committer | cvs2fossil <cvs2fossil> | 2010-12-17 17:55:45 (GMT) |
| commit | 42ec8b1131aa68f91d67124d508d02a79844a117 (patch) | |
| tree | 204a2107d1e2576f7c3e2c7006e5ac0dbd74a670 /generic | |
| parent | 0440538b7ad50dd5141f92d24036f7ad45c799f7 (diff) | |
| download | tcl-dogeen_assembler_merge_synthetic.zip tcl-dogeen_assembler_merge_synthetic.tar.gz tcl-dogeen_assembler_merge_synthetic.tar.bz2 | |
Created branch dogeen-assembler-merge-syntheticdogeen_assembler_mergedogeen_assembler_merge_synthetic
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | generic/tclPanic.c | 28 |
2 files changed, 7 insertions, 25 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 54a6579..2e4b1fc 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tcl.h,v 1.311 2010/12/14 21:51:53 nijtmans Exp $ + * RCS: @(#) $Id: tcl.h,v 1.309 2010/12/10 21:59:24 nijtmans Exp $ */ #ifndef _TCL @@ -190,7 +190,7 @@ extern "C" { # endif #else # define DLLIMPORT -# if defined(__GNUC__) && !defined(NO_VIZ) && !defined(STATIC_BUILD) +# if defined(__GNUC__) && __GNUC__ > 3 # define DLLEXPORT __attribute__ ((visibility("default"))) # else # define DLLEXPORT 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 + } } /* |