summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tcl.h6
-rw-r--r--win/tclWinPanic.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index d339b8f..73f38d6 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -117,7 +117,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 */
@@ -2312,9 +2312,9 @@ const char * TclTomMathInitializeStubs(Tcl_Interp *interp,
const char * TclInitStubTable(const char *version);
void * TclStubCall(void *arg);
#if defined(_WIN32)
- TCL_NORETURN1 void Tcl_ConsolePanic(const char *format, ...);
+ TCL_NORETURN void Tcl_ConsolePanic(const char *format, ...);
#else
-# define Tcl_ConsolePanic NULL
+# define Tcl_ConsolePanic ((Tcl_PanicProc *)NULL)
#endif
#ifdef USE_TCL_STUBS
diff --git a/win/tclWinPanic.c b/win/tclWinPanic.c
index 7928dcd..3d9e98c 100644
--- a/win/tclWinPanic.c
+++ b/win/tclWinPanic.c
@@ -1,4 +1,4 @@
- /*
+/*
* tclWinPanic.c --
*
* Contains the Windows-specific command-line panic proc.
@@ -28,7 +28,7 @@
*----------------------------------------------------------------------
*/
-TCL_NORETURN1 void
+TCL_NORETURN void
Tcl_ConsolePanic(
const char *format, ...)
{