diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-09 23:18:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-09 23:18:04 +0000 |
commit | 3e5f70a8153f8ec955af1c6bc721f2e3ea1814a5 (patch) | |
tree | 29da7e6c2a3d146f50323f12573e3ba4fb5bbb64 /ext/tk | |
parent | 4b731d3bc973dae866211d6f6f9574300718cfe7 (diff) | |
download | ruby-3e5f70a8153f8ec955af1c6bc721f2e3ea1814a5.tar.gz |
* math.c (log2): may be a macro.
* parse.y (args, block_param, f_args): pass f_post_arg to #params.
* util.c (powersOf10): constified.
* ext/readline/readline.c: include extconf.h first.
* ext/ripper/eventids2.c: removed tLAMBDA_ARG.
* ext/tk/tcltklib.c (lib_fromUTF8_core): removed conflict.
* ext/tk/tkutil/tkutil.c (cbsubst_get_subst_arg): rb_id2name() is
defined as const now.
* ext/win32ole/win32ole.c (fole_missing): ditto.
* lib/mkmf.rb (create_makefile): force to create extconf header.
* lib/optparse.rb (order!): use Proc#yield.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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; |