diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-12 03:16:31 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-12 03:16:31 +0000 |
| commit | fc8e62d0df805059eb73cf4c6dd54db0210db084 (patch) | |
| tree | 05cfac969865445eb7ddd74700ef60350d9a9e89 /ext/socket/extconf.rb | |
| parent | 20e165a04090a024db4d295d00af6ed1ac67578d (diff) | |
* bignum.c (rb_big_and): convert argument using 'to_int'.
* bignum.c (rb_big_or): ditto.
* bignum.c (rb_big_xor): ditto.
* eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
name is not tainted.
* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
Supports StringIO.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/extconf.rb')
| -rw-r--r-- | ext/socket/extconf.rb | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 357025cbbb..e888b2a197 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -323,11 +323,20 @@ if $getaddr_info_ok and have_func("getaddrinfo") and have_func("getnameinfo") have_getaddrinfo = true else if try_link(<<EOF) -#include <sys/types.h> -#include <netdb.h> -#include <string.h> -#include <sys/socket.h> -#include <netinet/in.h> +#ifndef _WIN32 +# include <sys/types.h> +# include <netdb.h> +# include <string.h> +# include <sys/socket.h> +# include <netinet/in.h> +#else +# include <windows.h> +# ifdef _WIN32_WCE +# include <winsock.h> +# else +# include <winsock.h> +# endif +#endif int main() { |