commit - eac9e0183f550f950bfcf5cdad959976cbe041ba
commit + a87638642c99d88a3543e0cd5864c9e54133fbee
blob - 95bba374c934dfd6963f6793b10c54edb99191a7
blob + b66e3644158645dbd89d3ce7af77f31b31499dbc
--- src/cmd/9660/dump9660.c
+++ 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){
blob - fb4ae5c4e931ca72d8df0186622634c9524a1580
blob + 50e63411d4b39db2064990439f90fcdadadaa1df
--- src/cmd/acme/fsys.c
+++ 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)
blob - 0d249a8b2474a1ddcfca21e33e6d41b0e6ee5106
blob + 2f6064673e660a63bf037362e502963ab3c43433
--- src/cmd/draw/stats.c
+++ 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)
blob - 059e018b904178ce603ff162af44966f90a5dd32
blob + da00296e5cff9a315d30abe28c7bb78fb7b86c3a
--- src/cmd/jpg/toico.c
+++ 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 {
blob - 0f5bcc898b67dfe9a437257770448036a329ed1c
blob + 0ffd50534502f236a3e26a9b6b8c410121114b9c
--- src/cmd/plumb/fsys.c
+++ 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)
blob - 17d04cb73cc011dc51021b6c7ab8e0d1b0200b2e
blob + 526bd668a533cedbf0970ef1153c08e4795bc1f1
--- src/libdraw/ml-lsetrefresh.c
+++ src/libdraw/ml-lsetrefresh.c
@@ -10,13 +10,13 @@ memlsetrefresh(Memimage *i, Refreshfn fn, void *ptr)
 	Memlayer *l;
 
 	l = i->layer;
-	if(l->refreshfn!=nil && fn!=nil){	/* just change functions */
+	if(l->refreshfn!=0 && fn!=0){	/* just change functions */
 		l->refreshfn = fn;
 		l->refreshptr = ptr;
 		return 1;
 	}
 
-	if(l->refreshfn == nil){	/* is using backup image; just free it */
+	if(l->refreshfn == 0){	/* is using backup image; just free it */
 		freememimage(l->save);
 		l->save = nil;
 		l->refreshfn = fn;
blob - 23a8b290bc190b67048be4b2662397ab02fdc137
blob + b953411771b7a2800631983b5fefa3528a1a865f
--- src/libdraw/ml-unload.c
+++ src/libdraw/ml-unload.c
@@ -35,7 +35,7 @@ memunload(Memimage *src, Rectangle r, uchar *data, int
 	 * src is an obscured layer or data is unaligned
 	 */
 	if(dl->save && dx==0){
-		if(dl->refreshfn != nil)
+		if(dl->refreshfn != 0)
 			return -1;	/* can't unload window if it's not Refbackup */
 		if(n > 0)
 			memlhide(src, r);
blob - 756518971e3d07ff818fec62e862f6d513227fc1
blob + 3dfe254b1008f4a4c6bb0c8b29b555e510075db6
--- src/libmach/crack.c
+++ src/libmach/crack.c
@@ -66,7 +66,7 @@ mapfile(Fhdr *fp, ulong base, Map *map, Regs **regs)
 		werrstr("no map");
 		return -1;
 	}
-	if(fp->map == nil){
+	if(fp->map == 0){
 		werrstr("cannot load map for this file type");
 		return -1;
 	}
blob - b89e1fba2aea6612e2e12cd7419f077301560242
blob + eb99947d39856eeb2615a1ab24598b12ef15ab1a
--- src/libmach/crackelf.c
+++ src/libmach/crackelf.c
@@ -287,7 +287,7 @@ mapcoreregs(Fhdr *fp, Map *map, Regs **rp)
 	UregRegs *r;
 
 	elf = fp->elf;
-	if(elf->coreregs == nil){
+	if(elf->coreregs == 0){
 		werrstr("cannot parse %s %s cores", fp->mname, fp->aname);
 		return -1;
 	}
blob - 2745dd4c845a52f2c5ad043b288f4e289fcbbaa0
blob + bfb5f722813acb01c7712bf157a4344fa7440cbd
--- src/libmach/map.c
+++ src/libmach/map.c
@@ -40,7 +40,7 @@ addseg(Map *map, Seg seg)
 	if(ss == nil)
 		return -1;
 	map->seg = ss;
-	if(seg.rw == nil){
+	if(seg.rw == 0){
 		if(seg.name && strcmp(seg.name, "zero") == 0)
 			seg.rw = zerorw;
 		else if(seg.p)
blob - d34bb864362fd93f2d20bc5eaeec2c843fa438c4
blob + 18805a51943d46a64135f10c7a6e0a7e6b523733
--- src/libmach/stabs.c
+++ src/libmach/stabs.c
@@ -17,7 +17,7 @@ stabsym(Stab *stabs, int i, StabSym *sym)
 		werrstr("no stabs");
 		return -1;
 	}
-	if(stabs->e2==nil || stabs->e4==nil){
+	if(stabs->e2==0 || stabs->e4==0){
 		werrstr("no data extractors");
 		return -1;
 	}
blob - 8347630c221421e5a43c9ec6fb37a9ccee929fca
blob + b734957f39c3d05b35e9336e1106f95565a06b9d
--- src/libmach/sym.c
+++ src/libmach/sym.c
@@ -427,7 +427,7 @@ syminit(Fhdr *hdr)
 	int i;
 	Symbol *r, *w, *es;
 
-	if(hdr->syminit == nil){
+	if(hdr->syminit == 0){
 		werrstr("no debugging symbols");
 		return -1;
 	}
blob - 55170c756919421ce45abf2d4a3d94ad6035a2fc
blob + 241c16ffceff3eaaf1e4832839f85fb17a199684
--- src/libthread/note.c
+++ src/libthread/note.c
@@ -58,7 +58,7 @@ delayednotes(Proc *p, void *v)
 	for(n=notes; n<enotes; n++){
 		if(n->proc == p){
 			for(i=0; i<NFN; i++){
-				if(onnotepid[i]!=p->pid || (fn = onnote[i])==nil)
+				if(onnotepid[i]!=p->pid || (fn = onnote[i])==0)
 					continue;
 				if((*fn)(v, n->s))
 					break;