summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-11 11:13:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-11 11:13:40 +0000
commit8125655b937adbce9dd731ff014495d452e36fa8 (patch)
treeffc09f3ec515ef406e58ec1de735da380269c1fb
parent8e8e97feab125a4762fd260f78a0983970efb849 (diff)
downloadruby-8125655b937adbce9dd731ff014495d452e36fa8.tar.gz
ruby-8125655b937adbce9dd731ff014495d452e36fa8.tar.xz
ruby-8125655b937adbce9dd731ff014495d452e36fa8.zip
* ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
name. [ruby-dev:38150] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/dl/handle.c12
2 files changed, 6 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 361ece1ff..476693f82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 11 20:13:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol
+ name. [ruby-dev:38150]
+
Wed Mar 11 17:26:38 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/dl/win32/lib/Win32API.rb: call by :stdcall as default.
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index bf2d7aa6c..4647f2a7b 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -145,17 +145,7 @@ rb_dlhandle_sym(VALUE self, VALUE sym)
rb_secure(2);
- if( sym == Qnil ){
-#if defined(RTLD_NEXT)
- name = RTLD_NEXT;
-#else
- name = NULL;
-#endif
- }
- else{
- name = StringValuePtr(sym);
- }
-
+ name = StringValuePtr(sym);
Data_Get_Struct(self, struct dl_handle, dlhandle);
if( ! dlhandle->open ){