From: Russ Cox <rsc@golang.org>
Date: Mon, 24 Sep 2012 18:58:45 +0000 (-0400)
Subject: misc/cgo: prepare for 64-bit ints
X-Git-Tag: go1.1rc2~2346
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0a006b4923c129a4b699f5ba17114fc98e20ce4c;p=gostls13.git

misc/cgo: prepare for 64-bit ints

In a few places, the existing cgo tests assume that a
Go int is the same as a C int. Making int 64 bits wide
on 64-bit platforms violates this assumption.
Change that code to assume that Go int32 and C int
are the same instead. That's still not great, but it's better,
and I am unaware of any systems we run on where it is not true.

Update #2188.

R=iant, r
CC=golang-dev
https://golang.org/cl/6552064
---

diff --git a/misc/cgo/life/life.go b/misc/cgo/life/life.go
index bbec4c56fa..fda5495e5f 100644
--- a/misc/cgo/life/life.go
+++ b/misc/cgo/life/life.go
@@ -11,8 +11,8 @@ import "C"
 
 import "unsafe"
 
-func Run(gen, x, y int, a []int) {
-	n := make([]int, x*y)
+func Run(gen, x, y int, a []int32) {
+	n := make([]int32, x*y)
 	for i := 0; i < gen; i++ {
 		C.Step(C.int(x), C.int(y), (*C.int)(unsafe.Pointer(&a[0])), (*C.int)(unsafe.Pointer(&n[0])))
 		copy(a, n)
diff --git a/misc/cgo/life/main.go b/misc/cgo/life/main.go
index dba0965eec..725e10f76c 100644
--- a/misc/cgo/life/main.go
+++ b/misc/cgo/life/main.go
@@ -24,7 +24,7 @@ var gen = flag.Int("gen", 10, "generations")
 func main() {
 	flag.Parse()
 
-	var a [MAXDIM * MAXDIM]int
+	var a [MAXDIM * MAXDIM]int32
 	for i := 2; i < *dim; i += 8 {
 		for j := 2; j < *dim-3; j += 8 {
 			for y := 0; y < 3; y++ {
diff --git a/misc/cgo/test/issue1560.go b/misc/cgo/test/issue1560.go
index 4f49399545..0f43b8bd0a 100644
--- a/misc/cgo/test/issue1560.go
+++ b/misc/cgo/test/issue1560.go
@@ -28,7 +28,7 @@ func parallelSleep(n int) {
 }
 
 //export BackgroundSleep
-func BackgroundSleep(n int) {
+func BackgroundSleep(n int32) {
 	go func() {
 		C.sleep(C.uint(n))
 		sleepDone <- true