summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/dl/dl.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5640ac25dd..7a6eb95282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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