summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-28 14:18:41 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-28 14:18:41 +0000
commitb6011f3d80fb622789fc249e63975f38c822ff98 (patch)
tree4e4f82f4da63f0edbc3763a6b726b8d605b56ed6 /ext
parent211eb7e343179cd9ba808640ab51bdfe871475e6 (diff)
downloadruby-b6011f3d80fb622789fc249e63975f38c822ff98.tar.gz
ruby-b6011f3d80fb622789fc249e63975f38c822ff98.tar.xz
ruby-b6011f3d80fb622789fc249e63975f38c822ff98.zip
* ext/socket/socket.c (Init_socket): IPv6 is not supported although
AF_INET6 is defined on bcc32. (rev1.108 again) * ext/socket/mkconstants.rb: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/mkconstants.rb10
-rw-r--r--ext/socket/socket.c6
2 files changed, 9 insertions, 7 deletions
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 20029c31a..42f36ece6 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -36,8 +36,6 @@ AF_APPLETALK
PF_APPLETALK
AF_UNSPEC
PF_UNSPEC
-AF_INET6
-PF_INET6
AF_LOCAL
PF_LOCAL
AF_IMPLINK
@@ -142,7 +140,6 @@ IPPROTO_TP
IPPROTO_XTP
IPPROTO_EON
IPPROTO_BIP
-
IPPROTO_RAW 255
IPPROTO_MAX
@@ -176,6 +173,7 @@ IP_DROP_MEMBERSHIP
IP_DEFAULT_MULTICAST_TTL
IP_DEFAULT_MULTICAST_LOOP
IP_MAX_MEMBERSHIPS
+
SO_DEBUG
SO_REUSEADDR
SO_REUSEPORT
@@ -205,11 +203,9 @@ SO_WANTOOBFLAG
SO_NREAD
SO_NKE
SO_NOSIGPIPE
-
SO_SECURITY_AUTHENTICATION
SO_SECURITY_ENCRYPTION_TRANSPORT
SO_SECURITY_ENCRYPTION_NETWORK
-
SO_BINDTODEVICE
SO_ATTACH_FILTER
SO_DETACH_FILTER
@@ -239,6 +235,7 @@ EAI_SYSTEM
EAI_BADHINTS
EAI_PROTOCOL
EAI_MAX
+
AI_PASSIVE
AI_CANONNAME
AI_NUMERICHOST
@@ -248,6 +245,7 @@ AI_V4MAPPED_CFG
AI_ADDRCONFIG
AI_V4MAPPED
AI_DEFAULT
+
NI_MAXHOST
NI_MAXSERV
NI_NOFQDN
@@ -255,7 +253,7 @@ NI_NUMERICHOST
NI_NAMEREQD
NI_NUMERICSERV
NI_DGRAM
+
SHUT_RD 0
SHUT_WR 1
SHUT_RDWR 2
-
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 16442b444..17aa3661c 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2643,5 +2643,9 @@ Init_socket()
/* constants */
mConst = rb_define_module_under(rb_cSocket, "Constants");
- #include "constants.h"
+#include "constants.h"
+#ifdef INET6 /* IPv6 is not supported although AF_INET6 is defined on bcc32/mingw */
+ sock_define_const("AF_INET6", AF_INET6);
+ sock_define_const("PF_INET6", PF_INET6);
+#endif
}