From: Shenghou Ma <minux.ma@gmail.com>
Date: Mon, 23 Jan 2012 19:45:30 +0000 (-0500)
Subject: cgo: -cdefs should translate unsafe.Pointer to void *
X-Git-Tag: weekly.2012-01-27~89
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=eb984f524e6b53eb32277adba81fe79177a28d8c;p=gostls13.git

cgo: -cdefs should translate unsafe.Pointer to void *
        Fixes #2454.

R=rsc, mikioh.mikioh, golang-dev, iant, iant
CC=golang-dev
https://golang.org/cl/5557068
---

diff --git a/src/cmd/cgo/godefs.go b/src/cmd/cgo/godefs.go
index df3f66ed02..6838729274 100644
--- a/src/cmd/cgo/godefs.go
+++ b/src/cmd/cgo/godefs.go
@@ -268,6 +268,11 @@ func cdecl(name, typ string) string {
 		typ = typ[i:]
 	}
 	// X T -> T X
+	// Handle the special case: 'unsafe.Pointer' is 'void *'
+	if typ == "unsafe.Pointer" {
+		typ = "void"
+		name = "*" + name
+	}
 	return typ + "\t" + name
 }