Fixes golang/go#4102. R=russross, minux.ma, rsc, agl CC=golang-dev https://golang.org/cl/6623053
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
+// +build !appengine
+
// This code was translated into a form compatible with 6a from the public
// domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
package salsa
// This function is implemented in salsa2020_amd64.s.
@@ -2,7 +2,7 @@
-// +build !amd64
+// +build !amd64 appengine
@@ -412,7 +412,7 @@ func parseTCPAddr(b []byte) (*net.TCPAddr, []byte, bool) {
if ip == nil {
return nil, b, false
}
- return &net.TCPAddr{ip, int(port)}, b, true
+ return &net.TCPAddr{IP: ip, Port: int(port)}, b, true
// Dial connects to the given network address using net.Dial and
-// +build linux
+// +build linux,!appengine
// Package terminal provides support functions for dealing with terminals, as
// commonly found on UNIX systems.