diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-12 01:51:57 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-12 01:51:57 +0000 |
commit | 27a4ca932d1cebec5852ec59f237ec1558273ab8 (patch) | |
tree | aec335921a0c606faa79cefc8be47dd0f340e704 | |
parent | c1e995c39a30a36457cde5861f650717ec584ae4 (diff) |
* ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
from Takahiro Kambe <taca@back-street.net>. [ruby-dev:27023]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/dl/dl.c | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Sep 12 10:45:58 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD + from Takahiro Kambe <taca@back-street.net>. [ruby-dev:27023] + Sun Sep 11 22:05:51 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * bin/erb (ERB::Main#run): set ERB#filename so that it is used diff --git a/ext/dl/dl.c b/ext/dl/dl.c index 02cfcf011c..8972f24e07 100644 --- a/ext/dl/dl.c +++ b/ext/dl/dl.c @@ -557,7 +557,11 @@ rb_io_to_ptr(VALUE self) GetOpenFile(self, fptr); fp = fptr->f; +#if defined(__DragonFly__) + return fp ? rb_dlptr_new(fp, 1, 0) : Qnil; +#else return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil; +#endif } VALUE |