summaryrefslogtreecommitdiffstats
path: root/generic/tclDecls.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-04 11:44:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-04 11:44:49 (GMT)
commitb2c080e9ae2d44b453f81bae6443f6fffaf6b052 (patch)
tree96c798290148ac7d237058f68a1f177fe222b7b6 /generic/tclDecls.h
parent6e8238944201c02321c9c5fc20a4d95c4f5383c8 (diff)
parenta107ac202e6c6806a0690e555b1141f2d032fb41 (diff)
downloadtcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.zip
tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.tar.gz
tcl-b2c080e9ae2d44b453f81bae6443f6fffaf6b052.tar.bz2
Merge 8.6
Diffstat (limited to 'generic/tclDecls.h')
-rw-r--r--generic/tclDecls.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 4f9ed7c..b8becd3 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -1563,7 +1563,7 @@ EXTERN void Tcl_GetCommandFullName(Tcl_Interp *interp,
Tcl_Command command, Tcl_Obj *objPtr);
/* 518 */
EXTERN int Tcl_FSEvalFileEx(Tcl_Interp *interp,
- Tcl_Obj *fileName, const char *encodingName);
+ Tcl_Obj *fileName, const char *encoding);
/* 519 */
EXTERN Tcl_ExitProc * Tcl_SetExitProc(TCL_NORETURN1 Tcl_ExitProc *proc);
/* 520 */
@@ -2572,7 +2572,7 @@ typedef struct TclStubs {
Tcl_Command (*tcl_FindCommand) (Tcl_Interp *interp, const char *name, Tcl_Namespace *contextNsPtr, int flags); /* 515 */
Tcl_Command (*tcl_GetCommandFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 516 */
void (*tcl_GetCommandFullName) (Tcl_Interp *interp, Tcl_Command command, Tcl_Obj *objPtr); /* 517 */
- int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encodingName); /* 518 */
+ int (*tcl_FSEvalFileEx) (Tcl_Interp *interp, Tcl_Obj *fileName, const char *encoding); /* 518 */
TCL_DEPRECATED_API("Don't use this function in a stub-enabled extension") Tcl_ExitProc * (*tcl_SetExitProc) (TCL_NORETURN1 Tcl_ExitProc *proc); /* 519 */
void (*tcl_LimitAddHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData, Tcl_LimitHandlerDeleteProc *deleteProc); /* 520 */
void (*tcl_LimitRemoveHandler) (Tcl_Interp *interp, int type, Tcl_LimitHandlerProc *handlerProc, void *clientData); /* 521 */