From 4312ce45fa0afb26e5e2e021956b8e4ff5bf1438 Mon Sep 17 00:00:00 2001 From: hacknode Date: Tue, 9 Jan 2018 14:19:50 +0800 Subject: [PATCH 1/2] Update ch2-01-hello-cgo.md --- ch2-cgo/ch2-01-hello-cgo.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ch2-cgo/ch2-01-hello-cgo.md b/ch2-cgo/ch2-01-hello-cgo.md index 3cd90d0..84b9515 100644 --- a/ch2-cgo/ch2-01-hello-cgo.md +++ b/ch2-cgo/ch2-01-hello-cgo.md @@ -127,6 +127,6 @@ func SayHello(s *C.char) { } ``` -虽然看起来全部是Go语言代码,但是执行的时候是先从Go语言的`main`函数,到CGO自动生成的C语言版本`SayHello`桥接函数,最好又回到了Go语言环境的`SayHello`函数。虽然看起来有点绕,但CGO确实是这样运行的。 +虽然看起来全部是Go语言代码,但是执行的时候是先从Go语言的`main`函数,到CGO自动生成的C语言版本`SayHello`桥接函数,最后又回到了Go语言环境的`SayHello`函数。虽然看起来有点绕,但CGO确实是这样运行的。 需要注意的是,CGO导出Go语言函数时,函数参数中不再支持C语言中`const`修饰符。 From 5bd4c00c326327884dd1ba6832eb4f1ff397c31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E6=9C=A8?= Date: Tue, 9 Jan 2018 15:14:06 +0800 Subject: [PATCH 2/2] fix spell --- ch1-basic/ch1-06-goroutine.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ch1-basic/ch1-06-goroutine.md b/ch1-basic/ch1-06-goroutine.md index 1a45ef9..1149297 100644 --- a/ch1-basic/ch1-06-goroutine.md +++ b/ch1-basic/ch1-06-goroutine.md @@ -26,7 +26,7 @@ func main() { mu.Lock() }() - mu.Unock() + mu.Unlock() } ```