qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 16:44:43 -07:00
Code Releases Activity

net: fix botched cgo netbsd merge

Browse Source 
Fix botched cgo_netbsd.go merge and remove redundant +build directive.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6282048
This commit is contained in:
Joel Sing 2012-06-05 02:12:23 +10:00
parent 5131deeeb2
commit 622ace8ffe
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pkg/net/cgo_netbsd.go
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build netbsd
package net package net
/* /*
@ -12,9 +10,5 @@ package net
import "C" import "C"
func cgoAddrInfoFlags() C.int { func cgoAddrInfoFlags() C.int {
<<<<<<< local
return C.AI_CANONNAME return C.AI_CANONNAME
=======
return C.AI_CANONNAME | C.AI_V4MAPPED | C.AI_ALL
>>>>>>> other
} }