From 68043e4379705b4e6f9a93bcba046ece61bfc73a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 Jun 2006 23:18:04 +0000
Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@10238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/tk/tcltklib.c      | 4 ----
 ext/tk/tkutil/tkutil.c | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'ext/tk')

diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index 9a64c2787..e43b98e2c 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 f4271a724..7789d4071 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;
-- 
cgit