summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-24 19:54:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-24 19:54:10 (GMT)
commita04135236066df485e1ccf078468de4d50f42dba (patch)
treef451328a9300614a9336d47d26d9ce849b35d1fd
parent1f51f9e619ce207bf8d4508809c3d3eb6c8c98c2 (diff)
parent5fa0bf3e811c89c63398a9595b8802e2fbaf5ab1 (diff)
downloadtcl-a04135236066df485e1ccf078468de4d50f42dba.zip
tcl-a04135236066df485e1ccf078468de4d50f42dba.tar.gz
tcl-a04135236066df485e1ccf078468de4d50f42dba.tar.bz2
Tcl_ConsolePanic() is TCL_NORETURN, not TCL_NORETURN1. Merge 8.6
-rw-r--r--generic/tcl.h2
-rw-r--r--win/tclWinPanic.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index de1daf6..fe37d2e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -158,7 +158,7 @@ extern "C" {
#else
# define TCL_FORMAT_PRINTF(a,b)
# if defined(_MSC_VER)
-# define TCL_NORETURN _declspec(noreturn)
+# define TCL_NORETURN __declspec(noreturn)
# define TCL_NOINLINE __declspec(noinline)
# else
# define TCL_NORETURN /* nothing */
diff --git a/win/tclWinPanic.c b/win/tclWinPanic.c
index 3131286..3d9e98c 100644
--- a/win/tclWinPanic.c
+++ b/win/tclWinPanic.c
@@ -28,7 +28,7 @@
*----------------------------------------------------------------------
*/
-void
+TCL_NORETURN void
Tcl_ConsolePanic(
const char *format, ...)
{