From: Russ Cox <rsc@golang.org>
Date: Mon, 1 Sep 2014 21:36:45 +0000 (-0400)
Subject: runtime: fix windows build
X-Git-Tag: go1.4beta1~588
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=60be96217d4192312295c89731ab1239a73235e7;p=gostls13.git

runtime: fix windows build

#ifdef'ed out code wasn't updated for argp change.

TBR=iant
CC=golang-codereviews
https://golang.org/cl/139040043
---

diff --git a/src/pkg/runtime/traceback_x86.c b/src/pkg/runtime/traceback_x86.c
index ac451240e2..169407ac81 100644
--- a/src/pkg/runtime/traceback_x86.c
+++ b/src/pkg/runtime/traceback_x86.c
@@ -132,7 +132,7 @@ runtime·gentraceback(uintptr pc0, uintptr sp0, uintptr lr0, G *gp, int32 skip,
 			// Invoke callback so that stack copier sees an uncopyable frame.
 			if(callback != nil) {
 				frame.continpc = frame.pc;
-				frame.argp = nil;
+				frame.argp = 0;
 				frame.arglen = 0;
 				if(!callback(&frame, v))
 					return n;