From: Russ Cox <rsc@golang.org>
Date: Wed, 21 Dec 2011 12:23:03 +0000 (-0500)
Subject: runtime: silence darwin/386 build warnings
X-Git-Tag: weekly.2011-12-22~60
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=343543894875f943e970f5acfe994849f70ddc36;p=gostls13.git

runtime: silence darwin/386 build warnings

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5502056
---

diff --git a/src/pkg/runtime/cgo/gcc_darwin_386.c b/src/pkg/runtime/cgo/gcc_darwin_386.c
index dbc3d31f9c..dfeb9e11f6 100644
--- a/src/pkg/runtime/cgo/gcc_darwin_386.c
+++ b/src/pkg/runtime/cgo/gcc_darwin_386.c
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+#include <string.h> /* for strerror */
 #include <pthread.h>
 #include "libcgo.h"
 
diff --git a/src/pkg/runtime/signal_darwin_386.c b/src/pkg/runtime/signal_darwin_386.c
index c1cab2ccaa..14f99115b4 100644
--- a/src/pkg/runtime/signal_darwin_386.c
+++ b/src/pkg/runtime/signal_darwin_386.c
@@ -142,7 +142,7 @@ sigaction(int32 i, void (*fn)(int32, Siginfo*, void*, G*), bool restart)
 		sa.sa_flags |= SA_RESTART;
 	sa.sa_mask = ~0U;
 	sa.sa_tramp = (void*)runtime·sigtramp;	// runtime·sigtramp's job is to call into real handler
-	*(uintptr*)&sa.__sigaction_u = (uintptr)fn;
+	*(uintptr*)sa.__sigaction_u = (uintptr)fn;
 	runtime·sigaction(i, &sa, nil);
 }