syscall: fix windows build

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5533063

diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index 7ed14a4dc2425664b978cfc0109b08afa092b4a9..441cc3747b00180618d98e70262ba30d4409a6ca 100644 (file)
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -640,22 +640,6 @@ type Linger struct {
        Linger int32
 }
 
-const (
-       IP_TOS             = 0x3
-       IP_TTL             = 0x4
-       IP_ADD_MEMBERSHIP  = 0xc
-       IP_DROP_MEMBERSHIP = 0xd
-)
-
-const (
-       IPV6_UNICAST_HOPS   = 0x4
-       IPV6_MULTICAST_IF   = 0x9
-       IPV6_MULTICAST_HOPS = 0xa
-       IPV6_MULTICAST_LOOP = 0xb
-       IPV6_JOIN_GROUP     = 0xc
-       IPV6_LEAVE_GROUP    = 0xd
-)
-
 type IPMreq struct {
        Multiaddr [4]byte /* in_addr */
        Interface [4]byte /* in_addr */

diff --git a/src/pkg/syscall/ztypes_windows.go b/src/pkg/syscall/ztypes_windows.go
index cfc180f70123b9d1abf0d231eacadc61189c51b8..a4840a8caa375bb27879fdf926a8829dafbb9a42 100644 (file)
--- a/src/pkg/syscall/ztypes_windows.go
+++ b/src/pkg/syscall/ztypes_windows.go
@@ -373,9 +373,10 @@ const (
        SOCK_RAW       = 3
        SOCK_SEQPACKET = 5
 
-       IPPROTO_IP  = 0
-       IPPROTO_TCP = 6
-       IPPROTO_UDP = 17
+       IPPROTO_IP   = 0
+       IPPROTO_IPV6 = 0x29
+       IPPROTO_TCP  = 6
+       IPPROTO_UDP  = 17
 
        SOL_SOCKET               = 0xffff
        SO_REUSEADDR             = 4
@@ -387,8 +388,18 @@ const (
        SO_SNDBUF                = 0x1001
        SO_UPDATE_ACCEPT_CONTEXT = 0x700b
 
-       IPPROTO_IPV6 = 0x29
-       IPV6_V6ONLY  = 0x1b
+       IP_TOS             = 0x3
+       IP_TTL             = 0x4
+       IP_ADD_MEMBERSHIP  = 0xc
+       IP_DROP_MEMBERSHIP = 0xd
+
+       IPV6_V6ONLY         = 0x1b
+       IPV6_UNICAST_HOPS   = 0x4
+       IPV6_MULTICAST_IF   = 0x9
+       IPV6_MULTICAST_HOPS = 0xa
+       IPV6_MULTICAST_LOOP = 0xb
+       IPV6_JOIN_GROUP     = 0xc
+       IPV6_LEAVE_GROUP    = 0xd
 
        SOMAXCONN = 0x7fffffff
 
@@ -400,9 +411,6 @@ const (
 
        WSADESCRIPTION_LEN = 256
        WSASYS_STATUS_LEN  = 128
-
-       IPV6_JOIN_GROUP  = 12
-       IPV6_LEAVE_GROUP = 13
 )
 
 type WSABuf struct {