diff options
| author | dgp <dgp@users.sourceforge.net> | 2021-01-25 18:51:12 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2021-01-25 18:51:12 (GMT) |
| commit | 8a88828033fc863695205c99660b9a2b323aa9a1 (patch) | |
| tree | 750452f70733591df875af4407cf80954cc3d1da /generic/tclDecls.h | |
| parent | 656d39948f5796e7d573071881390685b37f274a (diff) | |
| parent | 581d7fccf53c2adb8a64ea69674310c4f1c835c3 (diff) | |
| download | tcl-8a88828033fc863695205c99660b9a2b323aa9a1.zip tcl-8a88828033fc863695205c99660b9a2b323aa9a1.tar.gz tcl-8a88828033fc863695205c99660b9a2b323aa9a1.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclDecls.h')
| -rw-r--r-- | generic/tclDecls.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 9279e2d..aee81e7 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -4144,12 +4144,20 @@ extern const TclStubs *tclStubsPtr; # endif #endif +#undef Tcl_GetString +#undef Tcl_GetUnicode +#define Tcl_GetString(objPtr) \ + Tcl_GetStringFromObj(objPtr, (int *)NULL) +#define Tcl_GetUnicode(objPtr) \ + Tcl_GetUnicodeFromObj(objPtr, (int *)NULL) +#ifdef TCL_NO_DEPRECATED #undef Tcl_GetStringFromObj #undef Tcl_GetBytesFromObj #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_GetBytesFromObj(interp, objPtr, sizePtr) \ @@ -4158,9 +4166,9 @@ extern const TclStubs *tclStubsPtr; (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_GetBytesFromObj(interp, objPtr, sizePtr) \ @@ -4169,8 +4177,7 @@ extern const TclStubs *tclStubsPtr; (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 |