diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-21 12:31:17 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-21 12:31:17 +0000 |
| commit | 908baefe7da367539092994fdbc718a43772e956 (patch) | |
| tree | 338de71bb4177c4918348169b346425e61029b5f /ext/socket | |
| parent | b9d9ea62b4c8479c95e29ac478d3a39f9008ea5d (diff) | |
* 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
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/depend | 2 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/socket/rubysocket.h | 1 |
3 files changed, 4 insertions, 1 deletions
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> |