From: Anthony Martin <ality@pbrane.org>
Date: Tue, 4 Jun 2013 23:21:04 +0000 (-0700)
Subject: build: add intptr typedef for Plan 9
X-Git-Tag: go1.2rc2~1327
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=636169405c370e3010f7a08162ed83b0da013b49;p=gostls13.git

build: add intptr typedef for Plan 9

Revision 01810e5c68e9 added the following to src/pkg/runtime/stack.h:

        StackPreempt = (uintptr)(intptr)0xffffade,

The typedef for intptr is defined in two places:

        1. src/pkg/runtime/runtime.h for use by the runtime

        2. include/u.h for use by the compilers and linkers

On Plan 9, we don't use include/u.h but instead augment the host's
u.h with extra typedefs. These are in include/plan9/GOARCH/u.h.

We forgot to add intptr. It didn't cause a problem until now since
that typedef was never used outside the runtime.

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

diff --git a/include/plan9/386/u.h b/include/plan9/386/u.h
index 3f4a55cb20..4736b8efb2 100644
--- a/include/plan9/386/u.h
+++ b/include/plan9/386/u.h
@@ -4,11 +4,12 @@
 
 #include "/386/include/u.h"
 
-typedef char   int8;
-typedef uchar  uint8;
-typedef short  int16;
-typedef ushort uint16;
-typedef int    int32;
-typedef uint   uint32;
-typedef vlong  int64;
-typedef uvlong uint64;
+typedef	char	int8;
+typedef	uchar	uint8;
+typedef	short	int16;
+typedef	ushort	uint16;
+typedef	int	int32;
+typedef	uint	uint32;
+typedef	vlong	int64;
+typedef	uvlong	uint64;
+typedef	int	intptr;
diff --git a/include/plan9/amd64/u.h b/include/plan9/amd64/u.h
index f2430b5359..090b2fa5c9 100644
--- a/include/plan9/amd64/u.h
+++ b/include/plan9/amd64/u.h
@@ -4,11 +4,12 @@
 
 #include "/amd64/include/u.h"
 
-typedef char   int8;
-typedef uchar  uint8;
-typedef short  int16;
-typedef ushort uint16;
-typedef int    int32;
-typedef uint   uint32;
-typedef vlong  int64;
-typedef uvlong uint64;
+typedef	char	int8;
+typedef	uchar	uint8;
+typedef	short	int16;
+typedef	ushort	uint16;
+typedef	int	int32;
+typedef	uint	uint32;
+typedef	vlong	int64;
+typedef	uvlong	uint64;
+typedef	vlong	intptr;
diff --git a/include/plan9/arm/u.h b/include/plan9/arm/u.h
index c387ae7b18..19249aa480 100644
--- a/include/plan9/arm/u.h
+++ b/include/plan9/arm/u.h
@@ -4,11 +4,12 @@
 
 #include "/arm/include/u.h"
 
-typedef char   int8;
-typedef uchar  uint8;
-typedef short  int16;
-typedef ushort uint16;
-typedef int    int32;
-typedef uint   uint32;
-typedef vlong  int64;
-typedef uvlong uint64;
+typedef	char	int8;
+typedef	uchar	uint8;
+typedef	short	int16;
+typedef	ushort	uint16;
+typedef	int	int32;
+typedef	uint	uint32;
+typedef	vlong	int64;
+typedef	uvlong	uint64;
+typedef	int	intptr;