From: Russ Cox <rsc@golang.org>
Date: Sat, 19 Jun 2010 05:45:42 +0000 (-0700)
Subject: nacl: fix build
X-Git-Tag: weekly.2010-06-21~15
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a674c024c707cc85fa0dcd2920c5f7feb6ba1053;p=gostls13.git

nacl: fix build

TBR=r
CC=golang-dev
https://golang.org/cl/1706044
---

diff --git a/src/pkg/exp/nacl/av/av.go b/src/pkg/exp/nacl/av/av.go
index 0ed2757604..5c8728292d 100644
--- a/src/pkg/exp/nacl/av/av.go
+++ b/src/pkg/exp/nacl/av/av.go
@@ -157,7 +157,7 @@ func videoPollEvent(ev []byte) (err os.Error) {
 		if r == bridge.share.eq.wi {
 			return noEvents
 		}
-		copy(ev, &bridge.share.eq.event[r])
+		copy(ev, bridge.share.eq.event[r][0:])
 		bridge.share.eq.ri = (r + 1) % eqsize
 		return nil
 	}
diff --git a/src/pkg/exp/nacl/srpc/msg.go b/src/pkg/exp/nacl/srpc/msg.go
index b08327ca64..fe36dbdeb5 100644
--- a/src/pkg/exp/nacl/srpc/msg.go
+++ b/src/pkg/exp/nacl/srpc/msg.go
@@ -120,7 +120,7 @@ func (r *msgReceiver) recv() (*msg, os.Error) {
 	// returned the total byte count as n.
 	m := new(msg)
 	m.rdata = make([]byte, n)
-	copy(m.rdata, &r.data)
+	copy(m.rdata, r.data[0:])
 
 	// Make a copy of the desc too.
 	// The system call *did* update r.hdr.ndesc.