summaryrefslogtreecommitdiffstats
path: root/generic/tclInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-03-30 13:03:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-03-30 13:03:14 (GMT)
commit3597e830beba468e28a1bc22ab32dcb449d49fb1 (patch)
treeff573c8b2e225d32c4ba8474b5b18a6d89bbe5cc /generic/tclInt.h
parent4c5782603a16a70f2802c1ad32c8eae017b18301 (diff)
parentbcfc4a29c55da65006d3eb778c097ee6a24460e8 (diff)
downloadtcl-3597e830beba468e28a1bc22ab32dcb449d49fb1.zip
tcl-3597e830beba468e28a1bc22ab32dcb449d49fb1.tar.gz
tcl-3597e830beba468e28a1bc22ab32dcb449d49fb1.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclInt.h')
-rw-r--r--generic/tclInt.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 95b5b69..c12fee5 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4074,9 +4074,9 @@ MODULE_SCOPE int TclCompileAssembleCmd(Tcl_Interp *interp,
MODULE_SCOPE Tcl_Obj * TclStringCat(Tcl_Interp *interp, int objc,
Tcl_Obj *const objv[], int flags);
-MODULE_SCOPE int TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
+MODULE_SCOPE Tcl_Obj * TclStringFirst(Tcl_Obj *needle, Tcl_Obj *haystack,
int start);
-MODULE_SCOPE int TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
+MODULE_SCOPE Tcl_Obj * TclStringLast(Tcl_Obj *needle, Tcl_Obj *haystack,
int last);
MODULE_SCOPE Tcl_Obj * TclStringRepeat(Tcl_Interp *interp, Tcl_Obj *objPtr,
int count, int flags);
@@ -4816,13 +4816,13 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit;
*/
#ifndef TCL_MEM_DEBUG
-#define TclNewIntObj(objPtr, i) \
+#define TclNewIntObj(objPtr, w) \
do { \
TclIncrObjsAllocated(); \
TclAllocObjStorage(objPtr); \
(objPtr)->refCount = 0; \
(objPtr)->bytes = NULL; \
- (objPtr)->internalRep.wideValue = (Tcl_WideInt)(i); \
+ (objPtr)->internalRep.wideValue = (Tcl_WideInt)(w); \
(objPtr)->typePtr = &tclIntType; \
TCL_DTRACE_OBJ_CREATE(objPtr); \
} while (0)