summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tcl.decls4
-rw-r--r--generic/tcl.h4
-rw-r--r--generic/tclEvent.c6
-rw-r--r--generic/tclPanic.c30
4 files changed, 22 insertions, 22 deletions
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 41fe5f3..20b6cba 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -2417,10 +2417,10 @@ export {
Tcl_LibraryInitProc *initProc, Tcl_LibraryInitProc *safeInitProc)
}
export {
- const char *Tcl_SetPanicProc(TCL_NORETURN1 Tcl_PanicProc *panicProc)
+ const char *Tcl_SetPanicProc(Tcl_PanicProc *panicProc)
}
export {
- Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc)
+ Tcl_ExitProc *Tcl_SetExitProc(Tcl_ExitProc *proc)
}
export {
const char *Tcl_FindExecutable(const char *argv0)
diff --git a/generic/tcl.h b/generic/tcl.h
index 73f38d6..e40e8a9 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2371,7 +2371,7 @@ EXTERN void Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
EXTERN const char * Tcl_FindExecutable(const char *argv0);
EXTERN const char * Tcl_SetPreInitScript(const char *string);
EXTERN const char * Tcl_SetPanicProc(
- TCL_NORETURN1 Tcl_PanicProc *panicProc);
+ Tcl_PanicProc *panicProc);
EXTERN void Tcl_StaticLibrary(Tcl_Interp *interp,
const char *prefix,
Tcl_LibraryInitProc *initProc,
@@ -2379,7 +2379,7 @@ EXTERN void Tcl_StaticLibrary(Tcl_Interp *interp,
#ifndef TCL_NO_DEPRECATED
# define Tcl_StaticPackage Tcl_StaticLibrary
#endif
-EXTERN Tcl_ExitProc *Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc);
+EXTERN Tcl_ExitProc *Tcl_SetExitProc(Tcl_ExitProc *proc);
#ifdef _WIN32
EXTERN const char *TclZipfs_AppHook(int *argc, wchar_t ***argv);
#else
diff --git a/generic/tclEvent.c b/generic/tclEvent.c
index 69c3c27..49467c8 100644
--- a/generic/tclEvent.c
+++ b/generic/tclEvent.c
@@ -105,7 +105,7 @@ static const char ENCODING_ERROR[] = "\n\t(encoding error in stderr)";
* non-NULL value.
*/
-static TCL_NORETURN1 Tcl_ExitProc *appExitPtr = NULL;
+static Tcl_ExitProc *appExitPtr = NULL;
typedef struct ThreadSpecificData {
ExitHandler *firstExitPtr; /* First in list of all exit handlers for this
@@ -877,7 +877,7 @@ Tcl_DeleteThreadExitHandler(
Tcl_ExitProc *
Tcl_SetExitProc(
- TCL_NORETURN1 Tcl_ExitProc *proc) /* New exit handler for app or NULL */
+ Tcl_ExitProc *proc) /* New exit handler for app or NULL */
{
Tcl_ExitProc *prevExitProc;
@@ -958,7 +958,7 @@ Tcl_Exit(
int status) /* Exit status for application; typically 0
* for normal return, 1 for error return. */
{
- TCL_NORETURN1 Tcl_ExitProc *currentAppExitPtr;
+ Tcl_ExitProc *currentAppExitPtr;
Tcl_MutexLock(&exitMutex);
currentAppExitPtr = appExitPtr;
diff --git a/generic/tclPanic.c b/generic/tclPanic.c
index 5a05c24..dcceb25 100644
--- a/generic/tclPanic.c
+++ b/generic/tclPanic.c
@@ -23,7 +23,7 @@
* procedure.
*/
-static TCL_NORETURN1 Tcl_PanicProc *panicProc = NULL;
+static Tcl_PanicProc *panicProc = NULL;
/*
*----------------------------------------------------------------------
@@ -43,7 +43,7 @@ static TCL_NORETURN1 Tcl_PanicProc *panicProc = NULL;
const char *
Tcl_SetPanicProc(
- TCL_NORETURN1 Tcl_PanicProc *proc)
+ Tcl_PanicProc *proc)
{
panicProc = proc;
return Tcl_InitSubsystems();
@@ -71,7 +71,7 @@ Tcl_SetPanicProc(
*/
/* coverity[+kill] */
-void
+TCL_NORETURN void
Tcl_Panic(
const char *format,
...)
@@ -104,21 +104,21 @@ Tcl_Panic(
fprintf(stderr, "\n");
fflush(stderr);
#endif
-# if defined(__GNUC__)
- __builtin_trap();
-# elif defined(_WIN64)
- __debugbreak();
-# elif defined(_MSC_VER) && defined (_M_IX86)
- _asm {int 3}
-# elif defined(_WIN32)
- DebugBreak();
-# endif
+ }
+#if defined(__GNUC__)
+ __builtin_trap();
+#elif defined(_WIN64)
+ __debugbreak();
+#elif defined(_MSC_VER) && defined (_M_IX86)
+ _asm {int 3}
+#elif defined(_WIN32)
+ DebugBreak();
+#endif
#if defined(_WIN32)
- ExitProcess(1);
+ ExitProcess(1);
#else
- abort();
+ abort();
#endif
- }
}
/*