From 908baefe7da367539092994fdbc718a43772e956 Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 21 Jun 2011 12:31:17 +0000
Subject: * internal.h: move rb_thread_io_blocking_region() declaration   from
 intern.h to internal.h. It's still experimental API and   need more
 discussion. [ruby-dev:43698] * include/ruby/intern.h: ditto.

* ext/socket/rubysocket.h: include internal.h.
* ext/socket/depend: add internal.h dependency.
* ext/socket/extconf.rb: add $INCFLAGS to topdir.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/depend       | 2 +-
 ext/socket/extconf.rb   | 2 ++
 ext/socket/rubysocket.h | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'ext/socket')

diff --git a/ext/socket/depend b/ext/socket/depend
index f870b9f834..81e4b4f17f 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,6 +1,6 @@
 SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \
 	$(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \
-	$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h
+	$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h $(topdir)/internal.h
 
 init.o: init.c $(SOCK_HEADERS)
 constants.o: constants.c constdefs.c $(SOCK_HEADERS)
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index dbce2bab47..24ab7ea881 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,5 +1,7 @@
 require 'mkmf'
 
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+
 case RUBY_PLATFORM
 when /(ms|bcc)win(32|64)|mingw/
   test_func = "WSACleanup"
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index a80c93e1fd..d7be138dfd 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -4,6 +4,7 @@
 #include "ruby/ruby.h"
 #include "ruby/io.h"
 #include "ruby/util.h"
+#include "internal.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-- 
cgit v1.2.3