summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-11 13:55:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-11 13:55:02 (GMT)
commit1ba24536456192e2d32ba0a36d4d2e67cfd74050 (patch)
treef15baaa006f36b6e18b47968d1cc4c50bf8d290a
parent20ac5ab1d39ebc78f06c1bcabb7a615f73017c30 (diff)
downloadtcl-1ba24536456192e2d32ba0a36d4d2e67cfd74050.zip
tcl-1ba24536456192e2d32ba0a36d4d2e67cfd74050.tar.gz
tcl-1ba24536456192e2d32ba0a36d4d2e67cfd74050.tar.bz2
No need for TCL_OBJTYPE_V0 in Tcl 8.7. Make StrIdxTreeObjType static const. Define TCL_OBJTYPE_V1/TCL_OBJTYPE_V2 for 8.7
-rw-r--r--generic/tcl.h2
-rw-r--r--generic/tclClockFmt.c3
-rw-r--r--generic/tclStrIdxTree.c5
3 files changed, 5 insertions, 5 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index ca8901d..de74afb 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -783,6 +783,8 @@ typedef struct Tcl_ObjType {
* old type. Returns TCL_ERROR on failure. */
} Tcl_ObjType;
#define TCL_OBJTYPE_V0 /* just empty */
+#define TCL_OBJTYPE_V1(a) /* just empty */
+#define TCL_OBJTYPE_V2(a,b,c,d,e,f,g,h) /* just empty */
/*
* The following structure stores an internal representation (internalrep) for
diff --git a/generic/tclClockFmt.c b/generic/tclClockFmt.c
index b9ce546..b5d507c 100644
--- a/generic/tclClockFmt.c
+++ b/generic/tclClockFmt.c
@@ -592,8 +592,7 @@ static const Tcl_ObjType ClockFmtObjType = {
ClockFmtObj_FreeInternalRep, /* freeIntRepProc */
ClockFmtObj_DupInternalRep, /* dupIntRepProc */
ClockFmtObj_UpdateString, /* updateStringProc */
- ClockFmtObj_SetFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0
+ ClockFmtObj_SetFromAny /* setFromAnyProc */
};
#define ObjClockFmtScn(objPtr) \
diff --git a/generic/tclStrIdxTree.c b/generic/tclStrIdxTree.c
index b6e0672..a1c83a9 100644
--- a/generic/tclStrIdxTree.c
+++ b/generic/tclStrIdxTree.c
@@ -60,13 +60,12 @@ static void StrIdxTreeObj_DupIntRepProc(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr);
static void StrIdxTreeObj_FreeIntRepProc(Tcl_Obj *objPtr);
static void StrIdxTreeObj_UpdateStringProc(Tcl_Obj *objPtr);
-Tcl_ObjType StrIdxTreeObjType = {
+static const Tcl_ObjType StrIdxTreeObjType = {
"str-idx-tree", /* name */
StrIdxTreeObj_FreeIntRepProc, /* freeIntRepProc */
StrIdxTreeObj_DupIntRepProc, /* dupIntRepProc */
StrIdxTreeObj_UpdateStringProc, /* updateStringProc */
- NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0
+ NULL /* setFromAnyProc */
};
/*