Compare function pointers against 0 rather than nil.
diff --git a/src/cmd/9660/dump9660.c b/src/cmd/9660/dump9660.c
index 95bba37..b66e364 100644
--- a/src/cmd/9660/dump9660.c
+++ b/src/cmd/9660/dump9660.c
@@ -146,7 +146,7 @@
/*
* 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 fb4ae5c..50e6341 100644
--- a/src/cmd/acme/fsys.c
+++ b/src/cmd/acme/fsys.c
@@ -156,7 +156,7 @@
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 0d249a8..2f60646 100644
--- a/src/cmd/draw/stats.c
+++ b/src/cmd/draw/stats.c
@@ -101,7 +101,7 @@
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 @@
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 059e018..da00296 100644
--- a/src/cmd/jpg/toico.c
+++ b/src/cmd/jpg/toico.c
@@ -75,7 +75,7 @@
}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 0f5bcc8..0ffd505 100644
--- a/src/cmd/plumb/fsys.c
+++ b/src/cmd/plumb/fsys.c
@@ -233,7 +233,7 @@
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)
