summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-08 10:20:08 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-08 10:20:08 +0000
commitee09006c1a0fac261f3cf2ba960a7cd68877b5c6 (patch)
treedfeee17ec9a6cde3d5118a4899a9f4cfde6842d1
parent2661e58b30e8b31a9237f82e4a8108b22cdd78a9 (diff)
downloadruby-ee09006c1a0fac261f3cf2ba960a7cd68877b5c6.tar.gz
ruby-ee09006c1a0fac261f3cf2ba960a7cd68877b5c6.tar.xz
ruby-ee09006c1a0fac261f3cf2ba960a7cd68877b5c6.zip
* ext/dl/cptr.c (rb_dlptr_s_to_ptr): no longer check
HAVE_RB_IO_STDIO_FILE. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/dl/cptr.c4
-rw-r--r--ext/dl/extconf.rb3
3 files changed, 4 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index dd9592422..45f102b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 3be97b272..aeb1852b4 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 8bac1e83f..abd8d8f78 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