diff options
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/tcltklib.c | 4 | ||||
| -rw-r--r-- | ext/tk/tkutil/tkutil.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 9a64c27870..e43b98e2c1 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -6217,11 +6217,7 @@ 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); diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index f4271a724c..7789d4071d 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -1234,7 +1234,8 @@ cbsubst_get_subst_arg(argc, argv, self) VALUE self; { struct cbsubst_info *inf; - char *str, *buf, *ptr; + const char *str; + char *buf, *ptr; int i, j, len; ID id; volatile VALUE arg_sym, ret; |