5 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/9660/dump9660.c b/src/cmd/9660/dump9660.c
index 95bba374..b66e3644 100644
--- a/src/cmd/9660/dump9660.c
+++ b/src/cmd/9660/dump9660.c
@@ -146,7 +146,7 @@ main(int argc, char **argv)
 	/*
 	 * Read new files into memory
 	 */
-	if(rdproto(proto, src, addprotofile, nil, &iroot) < 0)
+	if(rdproto(proto, src, addprotofile, 0, &iroot) < 0)
 		sysfatal("rdproto: %r");
 
 	if(mk9660){
diff --git a/src/cmd/acme/fsys.c b/src/cmd/acme/fsys.c
index fb4ae5c4..50e63411 100644
--- a/src/cmd/acme/fsys.c
+++ b/src/cmd/acme/fsys.c
@@ -156,7 +156,7 @@ fsysproc(void *v)
 			error("convert error in convM2S");
 		if(DEBUG)
 			fprint(2, "%F\n", &x->fcall);
-		if(fcall[x->fcall.type] == nil)
+		if(fcall[x->fcall.type] == 0)
 			x = respond(x, &t, "bad fcall type");
 		else{
 			if(x->fcall.type==Tversion || x->fcall.type==Tauth)
diff --git a/src/cmd/draw/stats.c b/src/cmd/draw/stats.c
index 0d249a8b..2f606467 100644
--- a/src/cmd/draw/stats.c
+++ b/src/cmd/draw/stats.c
@@ -101,7 +101,7 @@ struct Machine
 char	*menu2str[Nvalue+1];
 char xmenu2str[Nvalue+1][40];
 
-Menu	menu2 = {menu2str, nil};
+Menu	menu2 = {menu2str, 0};
 int		present[Nvalue];
 Image	*cols[Ncolor][3];
 Graph	*graph;
@@ -792,7 +792,7 @@ threadmain(int argc, char *argv[])
 		for(j=0; j<ngraph; j++)
 			graph[i*ngraph+j].mach = &mach[i];
 
-	if(initdraw(nil, nil, "stats") < 0)
+	if(initdraw(0, nil, "stats") < 0)
 		sysfatal("initdraw: %r");
 	colinit();
 	if((mc = initmouse(nil, screen)) == nil)
diff --git a/src/cmd/jpg/toico.c b/src/cmd/jpg/toico.c
index 059e018b..da00296e 100644
--- a/src/cmd/jpg/toico.c
+++ b/src/cmd/jpg/toico.c
@@ -75,7 +75,7 @@ main(int argc, char **argv)
 	}ARGEND;
 
 	/* read in all the images */
-	initdraw(nil, nil, nil);
+	initdraw(0, nil, nil);
 	if(argc < 1){
 		readicon("/fd/0");
 	} else {
diff --git a/src/cmd/plumb/fsys.c b/src/cmd/plumb/fsys.c
index 0f5bcc89..0ffd5053 100644
--- a/src/cmd/plumb/fsys.c
+++ b/src/cmd/plumb/fsys.c
@@ -233,7 +233,7 @@ fsysproc(void *v)
 			error("convert error in convM2S");
 		if(debug)
 			fprint(2, "<= %F\n", t);
-		if(fcall[t->type] == nil)
+		if(fcall[t->type] == 0)
 			fsysrespond(t, buf, Ebadfcall);
 		else{
 			if(t->type==Tversion || t->type==Tauth)