summaryrefslogtreecommitdiffstats
path: root/generic/tclDecls.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-03-12 08:56:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-03-12 08:56:08 (GMT)
commitb2a28063811abb4c3bbe540d8e42b24c571b4588 (patch)
tree30f870c7f5df25f820f860f674287a5ebecfaa0b /generic/tclDecls.h
parenta5c62db26532cc6167321db34f6f97d8bc45875f (diff)
downloadtcl-b2a28063811abb4c3bbe540d8e42b24c571b4588.zip
tcl-b2a28063811abb4c3bbe540d8e42b24c571b4588.tar.gz
tcl-b2a28063811abb4c3bbe540d8e42b24c571b4588.tar.bz2
Restore the TclGetStringFromObj() macro in tclInt.h as it was in 8.6/8.7
Diffstat (limited to 'generic/tclDecls.h')
-rw-r--r--generic/tclDecls.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index a2b0ec1..2acbb38 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4158,19 +4158,17 @@ extern const TclStubs *tclStubsPtr;
# define Tcl_GetMaster Tcl_GetParent
#endif
-#ifdef USE_TCL_STUBS
- /* Protect those 10 functions, make them useless through the stub table */
-# undef TclGetStringFromObj
-# undef TclGetBytesFromObj
-# undef TclGetUnicodeFromObj
-# undef TclListObjGetElements
-# undef TclListObjLength
-# undef TclDictObjSize
-# undef TclSplitList
-# undef TclSplitPath
-# undef TclFSSplitPath
-# undef TclParseArgsObjv
-#endif
+/* Protect those 10 functions, make them useless through the stub table */
+#undef TclGetStringFromObj
+#undef TclGetBytesFromObj
+#undef TclGetUnicodeFromObj
+#undef TclListObjGetElements
+#undef TclListObjLength
+#undef TclDictObjSize
+#undef TclSplitList
+#undef TclSplitPath
+#undef TclFSSplitPath
+#undef TclParseArgsObjv
#if TCL_MAJOR_VERSION < 9
/* TIP #627 for 8.7 */
@@ -4236,7 +4234,7 @@ extern const TclStubs *tclStubsPtr;
TclGetBytesFromObj((interp), (objPtr), (sizePtr)) : \
(Tcl_GetBytesFromObj)((interp), (objPtr), (Tcl_Size *)(void *)(sizePtr)))
# define Tcl_GetStringFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
- TclGetStringFromObj((objPtr), (sizePtr)) : \
+ (TclGetStringFromObj)((objPtr), (sizePtr)) : \
(Tcl_GetStringFromObj)((objPtr), (Tcl_Size *)(void *)(sizePtr)))
# define Tcl_GetUnicodeFromObj(objPtr, sizePtr) (sizeof(*(sizePtr)) <= sizeof(int) ? \
TclGetUnicodeFromObj((objPtr), (sizePtr)) : \