diff options
| -rw-r--r-- | doc/ByteArrObj.3 | 3 | ||||
| -rw-r--r-- | doc/StringObj.3 | 4 | ||||
| -rw-r--r-- | generic/tclDecls.h | 14 |
3 files changed, 13 insertions, 8 deletions
diff --git a/doc/ByteArrObj.3 b/doc/ByteArrObj.3 index b0ef9a7..09400c8 100644 --- a/doc/ByteArrObj.3 +++ b/doc/ByteArrObj.3 @@ -38,7 +38,8 @@ byte-array type. For \fBTcl_GetByteArrayFromObj\fR and the byte-array value; if \fIobjPtr\fR does not already point to a byte-array value, it will be converted to one. .AP size_t | int *lengthPtr out -If non-NULL, filled with the length of the array of bytes in the value. +Filled with the length of the array of bytes in the value. +May be (int *)NULL when not used. .BE .SH DESCRIPTION diff --git a/doc/StringObj.3 b/doc/StringObj.3 index 3e4e8ac..c55f57d 100644 --- a/doc/StringObj.3 +++ b/doc/StringObj.3 @@ -120,8 +120,8 @@ Points to a value to manipulate. .AP Tcl_Obj *appendObjPtr in The value to append to \fIobjPtr\fR in \fBTcl_AppendObjToObj\fR. .AP size_t | int *lengthPtr out -If non-NULL, the location where \fBTcl_GetStringFromObj\fR will store -the length of a value's string representation. +The location where \fBTcl_GetStringFromObj\fR will store the length +of a value's string representation. May be (int *)NULL when not used. .AP "const char" *string in Null-terminated string value to append to \fIobjPtr\fR. .AP va_list argList in diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 700f3e2..0803448 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -4138,28 +4138,32 @@ extern const TclStubs *tclStubsPtr; # endif #endif +#undef Tcl_GetUnicode +#define Tcl_GetUnicode(objPtr) \ + Tcl_GetUnicodeFromObj(objPtr, (int *)NULL) +#ifdef TCL_NO_DEPRECATED #undef Tcl_GetStringFromObj #undef Tcl_GetUnicodeFromObj #undef Tcl_GetByteArrayFromObj -#undef Tcl_GetUnicode +#endif #if defined(USE_TCL_STUBS) +#ifdef TCL_NO_DEPRECATED #define Tcl_GetStringFromObj(objPtr, sizePtr) \ (sizeof(*sizePtr) <= sizeof(int) ? tclStubsPtr->tcl_GetStringFromObj(objPtr, (int *)sizePtr) : tclStubsPtr->tclGetStringFromObj(objPtr, (size_t *)sizePtr)) #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \ (sizeof(*sizePtr) <= sizeof(int) ? tclStubsPtr->tcl_GetByteArrayFromObj(objPtr, (int *)sizePtr) : tclStubsPtr->tclGetByteArrayFromObj(objPtr, (size_t *)sizePtr)) #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \ (sizeof(*sizePtr) <= sizeof(int) ? tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, (int *)sizePtr) : tclStubsPtr->tclGetUnicodeFromObj(objPtr, (size_t *)sizePtr)) -#define Tcl_GetUnicode(objPtr) \ - tclStubsPtr->tcl_GetUnicodeFromObj(objPtr, NULL) +#endif #else +#ifdef TCL_NO_DEPRECATED #define Tcl_GetStringFromObj(objPtr, sizePtr) \ (sizeof(*sizePtr) <= sizeof(int) ? (Tcl_GetStringFromObj)(objPtr, (int *)sizePtr) : (TclGetStringFromObj)(objPtr, (size_t *)sizePtr)) #define Tcl_GetByteArrayFromObj(objPtr, sizePtr) \ (sizeof(*sizePtr) <= sizeof(int) ? (Tcl_GetByteArrayFromObj)(objPtr, (int *)sizePtr) : TclGetByteArrayFromObj(objPtr, (size_t *)sizePtr)) #define Tcl_GetUnicodeFromObj(objPtr, sizePtr) \ (sizeof(*sizePtr) <= sizeof(int) ? (Tcl_GetUnicodeFromObj)(objPtr, (int *)sizePtr) : TclGetUnicodeFromObj(objPtr, (size_t *)sizePtr)) -#define Tcl_GetUnicode(objPtr) \ - (Tcl_GetUnicodeFromObj)(objPtr, NULL) +#endif #endif #undef Tcl_NewLongObj |