Merge trunk. Also update Tcl_ObjType.version to match TIP 644

1 files changed, 27 insertions, 0 deletions

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 66da441..455d7a6 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -925,6 +925,33 @@ Tcl_GetEncodingNames(
 }
 
 /*
+ *-------------------------------------------------------------------------
+ *
+ * Tcl_GetEncodingNulLength --
+ *
+ *	Given an encoding, return the number of nul bytes used for the
+ *      string termination.
+ *
+ * Results:
+ *	The name of the encoding.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+int
+Tcl_GetEncodingNulLength(
+    Tcl_Encoding encoding)
+{
+    if (encoding == NULL) {
+	encoding = systemEncoding;
+    }
+
+    return ((Encoding *) encoding)->nullSize;
+}
+
+/*
  *------------------------------------------------------------------------
  *
  * Tcl_SetSystemEncoding --