diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-06-19 12:42:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-06-19 12:42:00 (GMT) |
| commit | 2ebe7012dbad6f0a9e237750fd1db803a4b340d0 (patch) | |
| tree | 16c79790c5db7e341c47681332fa917448af24cc /generic/tclInt.h | |
| parent | 7f8e25f90769fba6d16e9f232487a14e691a1a26 (diff) | |
| parent | ec8dfd57db4d9f4cfdef1f38109a55addf6c030a (diff) | |
| download | tcl-2ebe7012dbad6f0a9e237750fd1db803a4b340d0.zip tcl-2ebe7012dbad6f0a9e237750fd1db803a4b340d0.tar.gz tcl-2ebe7012dbad6f0a9e237750fd1db803a4b340d0.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 47e514f..4de2c13 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3180,7 +3180,7 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp, MODULE_SCOPE void TclDeleteNamespaceVars(Namespace *nsPtr); MODULE_SCOPE void TclDeleteNamespaceChildren(Namespace *nsPtr); MODULE_SCOPE Tcl_Size TclDictGetSize(Tcl_Obj *dictPtr); -MODULE_SCOPE Tcl_Obj* TclDuplicatePureObj(Tcl_Interp *interp, +MODULE_SCOPE Tcl_Obj *TclDuplicatePureObj(Tcl_Interp *interp, Tcl_Obj * objPtr, const Tcl_ObjType *typPtr); MODULE_SCOPE int TclFindDictElement(Tcl_Interp *interp, const char *dict, Tcl_Size dictLength, @@ -4231,6 +4231,7 @@ MODULE_SCOPE TclProcessWaitStatus TclProcessWait(Tcl_Pid pid, int options, int *codePtr, Tcl_Obj **msgObjPtr, Tcl_Obj **errorObjPtr); MODULE_SCOPE int TclClose(Tcl_Interp *, Tcl_Channel chan); + /* * TIP #508: [array default] */ @@ -4937,7 +4938,7 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit; * * MODULE_SCOPE void TclNewIntObj(Tcl_Obj *objPtr, Tcl_WideInt w); * MODULE_SCOPE void TclNewDoubleObj(Tcl_Obj *objPtr, double d); - * MODULE_SCOPE void TclNewStringObj(Tcl_Obj *objPtr, const char *s, size_t len); + * MODULE_SCOPE void TclNewStringObj(Tcl_Obj *objPtr, const char *s, Tcl_Size len); * MODULE_SCOPE void TclNewLiteralStringObj(Tcl_Obj*objPtr, const char *sLiteral); * *---------------------------------------------------------------- @@ -4975,8 +4976,8 @@ MODULE_SCOPE Tcl_LibraryInitProc Procbodytest_SafeInit; TCL_DTRACE_OBJ_CREATE(objPtr); \ } while (0) -#define TclNewIndexObj(objPtr, uw) \ - TclNewIntObj(objPtr, uw) +#define TclNewIndexObj(objPtr, w) \ + TclNewIntObj(objPtr, w) #define TclNewDoubleObj(objPtr, d) \ do { \ @@ -5246,7 +5247,7 @@ typedef struct NRE_callback { #define TCLNR_FREE(interp, ptr) TclSmallFreeEx((interp), (ptr)) #else #define TCLNR_ALLOC(interp, ptr) \ - (ptr = (Tcl_Alloc(sizeof(NRE_callback)))) + ((ptr) = Tcl_Alloc(sizeof(NRE_callback))) #define TCLNR_FREE(interp, ptr) Tcl_Free(ptr) #endif |