From: Alan Donovan <adonovan@google.com>
Date: Thu, 30 Oct 2014 18:08:55 +0000 (-0400)
Subject: misc/cgo/test: fix bad C test code that fails on some configurations
X-Git-Tag: go1.4rc1~64
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a14ae4451700a690a2ca075d585d55d60f0d46e3;p=gostls13.git

misc/cgo/test: fix bad C test code that fails on some configurations

LGTM=rsc
R=rsc
CC=golang-codereviews
https://golang.org/cl/169800043
---

diff --git a/misc/cgo/test/issue9026.go b/misc/cgo/test/issue9026.go
index b17440452f..b5d975f17a 100644
--- a/misc/cgo/test/issue9026.go
+++ b/misc/cgo/test/issue9026.go
@@ -5,7 +5,7 @@ typedef struct {} git_merge_file_input;
 
 typedef struct {} git_merge_file_options;
 
-int git_merge_file(
+void git_merge_file(
         git_merge_file_input *in,
         git_merge_file_options *opts) {}
 */