From: Lucio De Re <lucio.dere@gmail.com>
Date: Thu, 30 May 2013 05:02:10 +0000 (+1000)
Subject: cmd/[568]l/obj.c: NULL is not recognised in Plan 9 build, use nil instead.
X-Git-Tag: go1.2rc2~1378
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0b88587d229d737a27f2dd0f8f75f5df41a11cf7;p=gostls13.git

cmd/[568]l/obj.c: NULL is not recognised in Plan 9 build, use nil instead.

Fixes #5591.

R=golang-dev, dave, minux.ma, cshapiro
CC=carl shapiro <cshapiro, golang-dev
https://golang.org/cl/9839046
---

diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 47831e39c6..8ecc23821e 100644
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -647,7 +647,7 @@ loop:
 	case APTRS:
 		if(skip)
 			goto casedef;
-		if(cursym->nptrs == -1 || cursym->ptrs == NULL) {
+		if(cursym->nptrs == -1 || cursym->ptrs == nil) {
 			diag("ldobj1: pointer map data provided for %s without a definition", cursym->name);
 			errorexit();
 		}
diff --git a/src/cmd/6l/obj.c b/src/cmd/6l/obj.c
index b4e77388d5..0fcafd7018 100644
--- a/src/cmd/6l/obj.c
+++ b/src/cmd/6l/obj.c
@@ -636,7 +636,7 @@ loop:
 	case APTRS:
 		if(skip)
 			goto casdef;
-		if(cursym->nptrs == -1 || cursym->ptrs == NULL) {
+		if(cursym->nptrs == -1 || cursym->ptrs == nil) {
 			diag("ldobj1: pointer map data provided for %s without a definition", cursym->name);
 			errorexit();
 		}
diff --git a/src/cmd/8l/obj.c b/src/cmd/8l/obj.c
index b5fa256f2b..1cc0444c4b 100644
--- a/src/cmd/8l/obj.c
+++ b/src/cmd/8l/obj.c
@@ -646,7 +646,7 @@ loop:
 	case APTRS:
 		if(skip)
 			goto casdef;
-		if(cursym->nptrs == -1 || cursym->ptrs == NULL) {
+		if(cursym->nptrs == -1 || cursym->ptrs == nil) {
 			diag("ldobj1: pointer map data provided for %s without a definition", cursym->name);
 			errorexit();
 		}