From 8b218e7c33f5cfaba2e9292a46d3bdd919efff30 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jun 2007 03:06:15 +0000
Subject: * include/ruby: moved public headers.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/dl/cptr.c     | 7 +++----
 ext/dl/dl.c       | 5 ++---
 ext/dl/extconf.rb | 4 +++-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ext/dl')

diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c
index abfd9e8d1..74a233b52 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 015e76f09..e4bd4d41e 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 99419b2d7..8bac1e83f 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
-- 
cgit