From aecfb1bc250e184c07f234d7df9e9a7234911078 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 6 Sep 2024 17:08:09 +0000 Subject: [PATCH] Fix [15bd03e81a]: `make genstubs` produces broken tkDecls.h file --- generic/tk.decls | 6 +++--- generic/tkDecls.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/generic/tk.decls b/generic/tk.decls index 5363c92f8e..2ade6a1e8e 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -806,7 +806,7 @@ declare 211 { Tk_OptionTable optionToken, Tk_Window tkwin) } declare 212 { - TCL_NORETURN1 void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, + void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp) } declare 213 { @@ -1166,11 +1166,11 @@ export { int exact) } export { - TCL_NORETURN1 void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, + void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp) } export { - TCL_NORETURN1 void Tk_MainExW(int argc, wchar_t **argv, + void Tk_MainExW(int argc, wchar_t **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); } diff --git a/generic/tkDecls.h b/generic/tkDecls.h index 86196ef294..34a452d12a 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -670,7 +670,7 @@ EXTERN int Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc, EXTERN int Tk_InitOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 212 */ -EXTERN TCL_NORETURN1 void Tk_MainEx(int argc, char **argv, +EXTERN void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 213 */ @@ -1106,7 +1106,7 @@ typedef struct TkStubs { int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */ int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */ int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */ - TCL_NORETURN1 void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */ + void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */ void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */ int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */ void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */