diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-08 10:20:08 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-08 10:20:08 +0000 |
commit | 7db17c6ad6ace607939ff9b817f15b1b77af4e63 (patch) | |
tree | dfeee17ec9a6cde3d5118a4899a9f4cfde6842d1 | |
parent | 4b3644bef769719e2b90c05b719120f27a438c23 (diff) | |
download | ruby-7db17c6ad6ace607939ff9b817f15b1b77af4e63.tar.gz |
* ext/dl/cptr.c (rb_dlptr_s_to_ptr): no longer check
HAVE_RB_IO_STDIO_FILE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/dl/cptr.c | 4 | ||||
-rw-r--r-- | ext/dl/extconf.rb | 3 |
3 files changed, 4 insertions, 9 deletions
@@ -1,7 +1,7 @@ -Wed Aug 8 18:58:14 2007 Yukihiro Matsumoto <matz@ruby-lang.org> +Wed Aug 8 19:17:40 2007 Yukihiro Matsumoto <matz@ruby-lang.org> - * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fptr->f was renamed to fd. a - report from Yusuf Celik <ycelik AT oytek.com.tr>. + * ext/dl/cptr.c (rb_dlptr_s_to_ptr): no longer check + HAVE_RB_IO_STDIO_FILE. Wed Aug 8 15:52:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org> diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c index 3be97b272c..aeb1852b48 100644 --- a/ext/dl/cptr.c +++ b/ext/dl/cptr.c @@ -420,11 +420,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val) rb_io_t *fptr; FILE *fp; GetOpenFile(val, fptr); -#if HAVE_RB_IO_STDIO_FILE fp = rb_io_stdio_file(fptr); -#else - fp = fptr->fd; -#endif return rb_dlptr_new(fp, 0, NULL); } else if( rb_obj_is_kind_of(val, rb_cString) == Qtrue ){ diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index 8bac1e83fb..abd8d8f781 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -25,8 +25,7 @@ else check = false end -if( check ) - have_func("rb_io_stdio_file", "ruby/ruby.h") +if check $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"] create_makefile("dl") end |