diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-04-09 18:04:08 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1999-04-09 18:04:08 +0000 |
| commit | 32e799db485107ba9d47fb4fb4cd44c9d6f57b8a (patch) | |
| tree | e33fd45f76d7f31959c1e5298902588de716657c /ext/socket | |
| parent | 35247a52ef719584a59ae9c518523f0ee825c8e3 (diff) | |
*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/extconf.rb | 3 | ||||
| -rw-r--r-- | ext/socket/socket.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 449d5a2785..5b3986735c 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -9,6 +9,9 @@ when /cygwin32/ when /beos/ test_func = "socket" have_library("net", "socket") +when /i386-os2_emx/ + test_func = "socket" + have_library("socket", "socket") else test_func = "socket" have_library("nsl", "t_open") diff --git a/ext/socket/socket.c b/ext/socket/socket.c index fcf8f18c1b..b7502e2915 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -19,6 +19,9 @@ #include <netdb.h> #endif #include <errno.h> +#ifdef __EMX__ +#undef HAVE_SYS_UN_H +#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -1244,7 +1247,7 @@ static VALUE sock_s_socketpair(class, domain, type, protocol) VALUE class, domain, type, protocol; { -#if !defined(NT) && !defined(__BEOS__) +#if !defined(NT) && !defined(__BEOS__) && !defined(__EMX__) int d, t, sp[2]; setup_domain_and_type(domain, &d, type, &t); |