* eval_load.c (load_ext, rb_require_safe): pass VALUE instead of

  pointer.  [ruby-Bugs-11659]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 24 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 051e67102a..68a621a9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 19 10:55:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_load.c (load_ext, rb_require_safe): pass VALUE instead of
+	  pointer.  [ruby-Bugs-11659]
+
 Mon Jun 18 08:47:54 2007  Technorama Ltd.  <oss-ruby@technorama.net>
 	* ext/openssl/{extconf.rb,ossl_ssl_session.c}:
 	  Fix ruby-Bugs-11513.
@@ -863,13 +868,13 @@ Tue May  8 20:23:07 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 Tue May  8 19:32:18 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 	* lib/rational.rb: fix high-precision Rationals cannot be
-	converted to Floats. [ruby-Bugs:10502], [ruby-core:11069],
-	[ruby-dev:30743]
+	  converted to Floats. [ruby-Bugs:10502], [ruby-core:11069],
+	  [ruby-dev:30743]
 
 Mon May  7 10:59:55 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/image.rb, test/rss/test_image.rb: fixed Image module
-	namespace URI. reported by Dmitry Borodaenko. Thanks.
+	  namespace URI. reported by Dmitry Borodaenko. Thanks.
 
 Sun May  6 18:44:11 2007  Minero Aoki  <aamine@loveruby.net>
 
@@ -2470,8 +2475,9 @@ Mon Feb 12 13:57:30 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 Mon Feb 12 11:48:52 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/dublincore.rb, lib/rss/maker/dublincore.rb: dc_rightses
-	-> dc_rights_list. dc_rightses still exists for backward
-	compatibility. [ruby-core:8350]
+	  -> dc_rights_list. dc_rightses still exists for backward
+	  compatibility. [ruby-core:8350]
+
 	* test/rss/test_maker_dc.rb: added tests for dc_rights_list.
 
 Sun Feb 11 22:40:17 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
@@ -2482,12 +2488,12 @@ Sun Feb 11 22:40:17 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 Sun Feb 11 22:11:05 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/xml-stylesheet.rb (RSS::XMLStyleSheet#initialize):
-	kept backward compatibility.
+	  kept backward compatibility.
 
 Sun Feb 11 22:10:08 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/parser.rb (RSS::ListenerMixin#start_else_element): used
-	const_defined? instead of constants.include?.
+	  const_defined? instead of constants.include?.
 
 Sun Feb 11 18:47:14 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
@@ -2764,12 +2770,12 @@ Tue Feb 06 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
 Tue Feb  6 20:36:19 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb, lib/rss/parser.rb: followed current Ruby
-	specification. [ruby-dev:30274]
+	  specification. [ruby-dev:30274]
 
 Tue Feb  6 20:29:44 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb, lib/rss/parser.rb: removed needless code for
-	backward compatibility.
+	  backward compatibility.
 
 Tue Feb  6 18:43:17 2007  Shugo Maeda  <shugo@ruby-lang.org>
 
@@ -2889,7 +2895,7 @@ Mon Feb  5 04:09:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 Sun Feb  4 20:34:41 2007  Kouhei Sutou  <kou@cozmixng.org>
 
 	* test/rss/rss-assertions.rb: removed needless code for backward
-	compatibility.
+	  compatibility.
 
 Sun Feb  4 02:22:59 2007  Akinori MUSHA  <knu@iDaemons.org>
 
@@ -3197,7 +3203,7 @@ Wed Jan 17 17:31:28 2007  Koichi Sasada  <ko1@atdot.net>
 Tue Jan 16 17:49:29 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c (eval_search_super_klass): rename to search_super_klass() and
-	use it by th_call_super().
+	  use it by th_call_super().
 
 	* insns.def: ditto.
 
@@ -3220,7 +3226,7 @@ Tue Jan 16 12:00:06 2007  Koichi Sasada  <ko1@atdot.net>
 	* string.c (sym_to_proc): supported.
 
 	* vm.c (invoke_block, th_invoke_yield, th_invoke_proc): fix to support
-	rb_proc_new.
+	  rb_proc_new.
 
 	* yarvcore.c: add a test code.
 
diff --git a/eval_load.c b/eval_load.c
index d95b438f63..866c45bf82 100644
--- a/eval_load.c
+++ b/eval_load.c
@@ -409,10 +409,10 @@ load_failed(VALUE fname)
 }
 
 static VALUE
-load_ext(VALUE arg)
+load_ext(VALUE path)
 {
     SCOPE_SET(NOEX_PUBLIC);
-    return (VALUE)dln_load((const char *)arg);
+    return (VALUE)dln_load(RSTRING_PTR(path));
 }
 
 VALUE
@@ -456,7 +456,7 @@ rb_require_safe(VALUE fname, int safe)
 		    ruby_sourcefile = rb_source_filename(RSTRING_PTR(path));
 		    ruby_sourceline = 0;
 		    handle = (long)rb_vm_call_cfunc(ruby_top_self, load_ext,
-						    ruby_source_filename, 0, path);
+						    path, 0, path);
 		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
 		    break;
 		}
diff --git a/version.h b/version.h
index a68aa80568..da4b7587dc 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-06-18"
+#define RUBY_RELEASE_DATE "2007-06-19"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070618
+#define RUBY_RELEASE_CODE 20070619
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];