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 c3ab9c5bcf9dd6c7890fe105a31a406596f3a05c..56ba74a50683d6a385cc3e4cf1fd8a5090adf4e4 100644 (file)
--- 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 39d8fed1d41b44691f874a0ad9b8d0644512b4c3..0592c57e1dec77aa680be2ba18a4f849587a4d50 100644 (file)
--- 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
 }