summaryrefslogtreecommitdiffstats
path: root/generic/tclInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-04-08 09:44:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-04-08 09:44:52 (GMT)
commit744ac0e8e689f0b14c6889a4ff2366e6ca4a3bf9 (patch)
tree15927b019bb63dfd796191b805e853b611e2adf3 /generic/tclInt.h
parentbc7b59b6f6f14a88bf2030aa3430b978482e06e5 (diff)
parentc7de8a1d22c60626b19b0bb57ac58fa7d9d5cc16 (diff)
downloadtcl-744ac0e8e689f0b14c6889a4ff2366e6ca4a3bf9.zip
tcl-744ac0e8e689f0b14c6889a4ff2366e6ca4a3bf9.tar.gz
tcl-744ac0e8e689f0b14c6889a4ff2366e6ca4a3bf9.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclInt.h')
-rw-r--r--generic/tclInt.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a141db0..9891e62 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3025,8 +3025,6 @@ MODULE_SCOPE int TclNREvalFile(Tcl_Interp *interp, Tcl_Obj *pathPtr,
MODULE_SCOPE void TclFSUnloadTempFile(Tcl_LoadHandle loadHandle);
MODULE_SCOPE int * TclGetAsyncReadyPtr(void);
MODULE_SCOPE Tcl_Obj * TclGetBgErrorHandler(Tcl_Interp *interp);
-MODULE_SCOPE unsigned char * TclGetBytesFromObj(Tcl_Interp *interp,
- Tcl_Obj *objPtr, int *lengthPtr);
MODULE_SCOPE int TclGetChannelFromObj(Tcl_Interp *interp,
Tcl_Obj *objPtr, Tcl_Channel *chanPtr,
int *modePtr, int flags);
@@ -3252,6 +3250,11 @@ MODULE_SCOPE void TclRegisterCommandTypeName(
MODULE_SCOPE int TclUtfCmp(const char *cs, const char *ct);
MODULE_SCOPE int TclUtfCasecmp(const char *cs, const char *ct);
MODULE_SCOPE int TclUtfCount(int ch);
+#if TCL_UTF_MAX > 3
+# define TclUtfToUCS4 Tcl_UtfToUniChar
+#else
+ MODULE_SCOPE int TclUtfToUCS4(const char *src, int *ucs4Ptr);
+#endif
MODULE_SCOPE Tcl_Obj * TclpNativeToNormalized(ClientData clientData);
MODULE_SCOPE Tcl_Obj * TclpFilesystemPathType(Tcl_Obj *pathPtr);
MODULE_SCOPE int TclpDlopen(Tcl_Interp *interp, Tcl_Obj *pathPtr,