From d252076f754874d48b808703fc817df4242d31da Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 23 Apr 2023 21:59:34 +0000
Subject: Missing  !defined(TCL_NO_DEPRECATED) around TIP #616 macro's. Thanks
 Rolf for noticing!

---
 generic/tclBinary.c  | 2 +-
 generic/tclDecls.h   | 2 ++
 generic/tclListObj.c | 2 +-
 generic/tclLiteral.c | 2 +-
 generic/tclUtil.c    | 4 ++--
 generic/tclZipfs.c   | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index d0aa089..3a9d62e 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -774,7 +774,7 @@ TclAppendBytesToByteArray(
 	 */
 
 	Tcl_Size attempt;
-	
+
 	/* Make sure we do not wrap when doubling */
 	if (needed <= (BYTEARRAY_MAX_LEN - needed)) {
 	    attempt = 2 * needed;
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index a8aa035..bab0fd3 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -4168,6 +4168,7 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_WCharLen (sizeof(wchar_t) != sizeof(short) \
 		? (Tcl_Size (*)(wchar_t *))tclStubsPtr->tcl_UniCharLen \
 		: (Tcl_Size (*)(wchar_t *))Tcl_Char16Len)
+#if TCL_MAJOR_VERSION < 9 || !defined(TCL_NO_DEPRECATED)
 #   undef Tcl_ListObjGetElements
 #   define Tcl_ListObjGetElements(interp, listPtr, objcPtr, objvPtr) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tclListObjGetElements((interp), (listPtr), (int *)(void *)(objcPtr), (objvPtr)) \
@@ -4196,6 +4197,7 @@ extern const TclStubs *tclStubsPtr;
 #   define Tcl_ParseArgsObjv(interp, argTable, objcPtr, objv, remObjv) (sizeof(*(objcPtr)) == sizeof(int) \
 		? tclStubsPtr->tclParseArgsObjv((interp), (argTable), (int *)(void *)(objcPtr), (objv), (remObjv)) \
 		: tclStubsPtr->tcl_ParseArgsObjv((interp), (argTable), (Tcl_Size *)(void *)(objcPtr), (objv), (remObjv)))
+#endif /* TCL_MAJOR_VERSION < 9 || !defined(TCL_NO_DEPRECATED) */
 #else
 #   define Tcl_WCharToUtfDString (sizeof(wchar_t) != sizeof(short) \
 		? (char *(*)(const wchar_t *, Tcl_Size, Tcl_DString *))Tcl_UniCharToUtfDString \
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 39d2c11..6d3b587 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -2025,7 +2025,7 @@ Tcl_ListObjLength(
     return TCL_OK;
 }
 
-Tcl_Size 
+Tcl_Size
 ListLength(Tcl_Obj *listPtr)
 {
     ListRep listRep;
diff --git a/generic/tclLiteral.c b/generic/tclLiteral.c
index 7ddb88a..9051b45 100644
--- a/generic/tclLiteral.c
+++ b/generic/tclLiteral.c
@@ -646,7 +646,7 @@ TclAddLiteralObj(
     if (litPtrPtr) {
 	*litPtrPtr = lPtr;
     }
-    
+
     return objIndex;
 }
 
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 00e1212..b765a0f 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -3679,8 +3679,8 @@ GetEndOffsetFromObj(
     offset = irPtr->wideValue;
 
     if (offset == WIDE_MAX) {
-	/* 
-	 * Encodes end+1. This is distinguished from end+n as noted above 
+	/*
+	 * Encodes end+1. This is distinguished from end+n as noted above
 	 * NOTE: this may wrap around if the caller passes (as lset does)
 	 * listLen-1 as endValue and and listLen is 0. The -1 will be
 	 * interpreted as FF...FF and adding 1 will result in 0 which
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 7843996..48e7415 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -5140,7 +5140,7 @@ ZipFSMatchMountPoints(
 {
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
-    size_t l; 
+    size_t l;
     Tcl_Size normLength;
     const char *path = Tcl_GetStringFromObj(normPathPtr, &normLength);
     size_t len = normLength;
-- 
cgit v0.12