diff options
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index d21b14f..62560bd 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1242,13 +1242,21 @@ MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion); #endif #if TCL_UTF_MAX > 4 -# define TkUtfToUniChar Tcl_UtfToUniChar -# define TkUniCharToUtf Tcl_UniCharToUtf +# define TkUtfToUniChar (size_t)Tcl_UtfToUniChar +# define TkUniCharToUtf (size_t)Tcl_UniCharToUtf #else - MODULE_SCOPE int TkUtfToUniChar(const char *, int *); - MODULE_SCOPE int TkUniCharToUtf(int, char *); + MODULE_SCOPE size_t TkUtfToUniChar(const char *, int *); + MODULE_SCOPE size_t TkUniCharToUtf(int, char *); #endif +#define TkGetStringFromObj(objPtr, lenPtr) \ + (((objPtr)->bytes \ + ? 0 : Tcl_GetString((objPtr)), \ + *(lenPtr) = (objPtr)->length, (objPtr)->bytes)) + +MODULE_SCOPE unsigned char *TkGetByteArrayFromObj(Tcl_Obj *objPtr, + size_t *lengthPtr); + /* * Unsupported commands. */ |