diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 00:27:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 00:27:43 +0000 |
| commit | f1eaa7583d6f7e36848a91af4801696870ba011e (patch) | |
| tree | 574bc68089d1105c1cc48922ad8b5fb03d973d35 /ext/socket/socket.c | |
| parent | 4949348aa8aeaaeea6711f156d262e5dec4b064f (diff) | |
| download | ruby-f1eaa7583d6f7e36848a91af4801696870ba011e.tar.gz ruby-f1eaa7583d6f7e36848a91af4801696870ba011e.tar.xz ruby-f1eaa7583d6f7e36848a91af4801696870ba011e.zip | |
* ext/socket/socket.c (constant_arg): constified.
* ext/socket/socket.c (optname_arg): cygwin does not have
IPPROTO_IPV6.
* ext/socket/mkconstants.rb (ipv6_optname_to_int): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -rw-r--r-- | ext/socket/socket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 08efab52d..3751303a9 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -242,7 +242,7 @@ ruby_getnameinfo__aix(sa, salen, host, hostlen, serv, servlen, flags) #endif static int -constant_arg(VALUE arg, int (*str_to_int)(char*, int, int*), char *errmsg) +constant_arg(VALUE arg, int (*str_to_int)(char*, int, int*), const char *errmsg) { VALUE tmp; char *ptr; @@ -295,8 +295,10 @@ optname_arg(int level, VALUE optname) return constant_arg(optname, so_optname_to_int, "unknown socket level option name"); case IPPROTO_IP: return constant_arg(optname, ip_optname_to_int, "unknown IP level option name"); +#ifdef IPPROTO_IPV6 case IPPROTO_IPV6: return constant_arg(optname, ipv6_optname_to_int, "unknown IPv6 level option name"); +#endif case IPPROTO_TCP: return constant_arg(optname, tcp_optname_to_int, "unknown TCP level option name"); case IPPROTO_UDP: |