summaryrefslogtreecommitdiff
path: root/ext/dl
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-10 03:06:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-10 03:06:15 +0000
commit2b592580bf65040373b55ff2ccc3b59a0a231a18 (patch)
tree642a6c82599486537c3136f32cac7a644c4bf4a3 /ext/dl
parent1b8a677b235066d91994e3490e0bce5a098196a2 (diff)
* include/ruby: moved public headers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl')
-rw-r--r--ext/dl/cptr.c7
-rw-r--r--ext/dl/dl.c5
-rw-r--r--ext/dl/extconf.rb4
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index abfd9e8d1c8..74a233b5277 100644
--- a/ext/dl/cptr.c
+++ b/ext/dl/cptr.c
@@ -2,10 +2,9 @@
* $Id$
*/
-#include <ruby.h>
-#include <rubyio.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
#include <ctype.h>
-#include <version.h> /* for ruby version code */
#include "dl.h"
VALUE rb_cDLCPtr;
@@ -421,7 +420,7 @@ rb_dlptr_s_to_ptr(VALUE self, VALUE val)
rb_io_t *fptr;
FILE *fp;
GetOpenFile(val, fptr);
-#if RUBY_VERSION_CODE >= 190
+#if HAVE_RB_IO_STDIO_FILE
fp = rb_io_stdio_file(fptr);
#else
fp = fptr->f;
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 015e76f09e4..e4bd4d41e92 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,6 +1,5 @@
-#include <ruby.h>
-#include <rubyio.h>
-#include <version.h>
+#include <ruby/ruby.h>
+#include <ruby/io.h>
#include <ctype.h>
#include "dl.h"
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
index 99419b2d7da..8bac1e83fb2 100644
--- a/ext/dl/extconf.rb
+++ b/ext/dl/extconf.rb
@@ -5,7 +5,7 @@ if( RbConfig::CONFIG['CC'] =~ /gcc/ )
end
$INSTALLFILES = [
- ["dl.h", "$(archdir)$(target_prefix)", ""],
+ ["dl.h", "$(HDRDIR)"],
]
$distcleanfiles << "callback.h"
@@ -26,5 +26,7 @@ else
end
if( check )
+ have_func("rb_io_stdio_file", "ruby/ruby.h")
+ $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
create_makefile("dl")
end