diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-25 14:59:55 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-25 14:59:55 (GMT) |
| commit | 7fc1793e376c779b947e5698bb75726478706d09 (patch) | |
| tree | af11aa5233e36439b8b6711af51d1ae1555246d9 /win | |
| parent | aa91667499a3100f53b03c6619736a85611dd9a2 (diff) | |
| parent | f5af55e3585dc3b89fabce063491e1831d75d975 (diff) | |
| download | tcl-7fc1793e376c779b947e5698bb75726478706d09.zip tcl-7fc1793e376c779b947e5698bb75726478706d09.tar.gz tcl-7fc1793e376c779b947e5698bb75726478706d09.tar.bz2 | |
Fix for [ef23a85ac6]: Tcl_PanicProc - Tcl9 & NaviServer.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinError.c | 8 | ||||
| -rw-r--r-- | win/tclWinFile.c | 14 |
2 files changed, 3 insertions, 19 deletions
diff --git a/win/tclWinError.c b/win/tclWinError.c index 7e5898b..4e8ae7e 100644 --- a/win/tclWinError.c +++ b/win/tclWinError.c @@ -381,7 +381,7 @@ Tcl_WinConvertError( *---------------------------------------------------------------------- */ -TCL_NORETURN void +void tclWinDebugPanic( const char *format, ...) { @@ -413,12 +413,6 @@ tclWinDebugPanic( fprintf(stderr, "\n"); fflush(stderr); } -# if defined(__GNUC__) - __builtin_trap(); -# else - DebugBreak(); -# endif - abort(); } #endif /* diff --git a/win/tclWinFile.c b/win/tclWinFile.c index b27487f..a808562 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -177,7 +177,7 @@ static int WinLink(const WCHAR *LinkSource, const WCHAR *LinkTarget, int linkAction); static int WinSymLinkDirectory(const WCHAR *LinkDirectory, const WCHAR *LinkTarget); -MODULE_SCOPE TCL_NORETURN void tclWinDebugPanic(const char *format, ...); +MODULE_SCOPE void tclWinDebugPanic(const char *format, ...); /* *-------------------------------------------------------------------- @@ -808,7 +808,7 @@ NativeWriteReparse( *---------------------------------------------------------------------- */ -TCL_NORETURN void +void tclWinDebugPanic( const char *format, ...) { @@ -838,16 +838,6 @@ tclWinDebugPanic( MessageBoxW(NULL, msgString, L"Fatal Error", MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); } -#if defined(__GNUC__) - __builtin_trap(); -#elif defined(_WIN64) - __debugbreak(); -#elif defined(_MSC_VER) && defined (_M_IX86) - _asm {int 3} -#else - DebugBreak(); -#endif - abort(); } /* |