diff options
Diffstat (limited to 'ext/tk/tcltklib.c')
| -rw-r--r-- | ext/tk/tcltklib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index e43b98e2c1..9a64c27870 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -6217,7 +6217,11 @@ lib_fromUTF8_core(ip_obj, src, encodename) char *s; int len; +<<<<<<< tcltklib.c + StringValue(str); +======= StringValue(str); +>>>>>>> 1.45 s = Tcl_GetByteArrayFromObj(Tcl_NewStringObj(RSTRING(str)->ptr, RSTRING(str)->len), &len); |