From: Russ Cox <rsc@golang.org>
Date: Thu, 28 Aug 2014 03:41:10 +0000 (-0400)
Subject: cmd/api: fix for Lock⇒Mutex change
X-Git-Tag: go1.4beta1~666
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=fee7c69c6c091d93c8c709ed562a477fd199bb3b;p=gostls13.git

cmd/api: fix for Lock⇒Mutex change

TBR=iant
CC=golang-codereviews
https://golang.org/cl/133150043
---

diff --git a/src/cmd/api/goapi.go b/src/cmd/api/goapi.go
index c3ab9c5bcf..56ba74a506 100644
--- a/src/cmd/api/goapi.go
+++ b/src/cmd/api/goapi.go
@@ -380,7 +380,7 @@ func (w *Walker) parseFile(dir, file string) (*ast.File, error) {
 		// Just enough to keep the api checker happy.
 		src := "package runtime; type (" +
 			" maptype struct{}; _type struct{}; alg struct{};" +
-			" mspan struct{}; m struct{}; lock struct{}; slicetype struct{};" +
+			" mspan struct{}; m struct{}; mutex struct{}; slicetype struct{};" +
 			" iface struct{}; eface struct{}; interfacetype struct{}; itab struct{};" +
 			" mcache struct{}; bucket struct{}; sudog struct{}; g struct{};" +
 			" hchan struct{}; chantype struct{}; waitq struct{};" +
diff --git a/src/pkg/runtime/syscall_windows.go b/src/pkg/runtime/syscall_windows.go
index 39d8fed1d4..0592c57e1d 100644
--- a/src/pkg/runtime/syscall_windows.go
+++ b/src/pkg/runtime/syscall_windows.go
@@ -9,7 +9,7 @@ import (
 )
 
 type callbacks struct {
-	lock
+	lock mutex
 	ctxt [cb_max]*wincallbackcontext
 	n    int
 }