commit - 0c6074b6920c8e115944c9c5e79b74e9faad84cb
commit + 8425b514aa027459410a6cbea98799680e33e480
blob - fc45ef28290c69445ce978692c748c25478381d0
blob + bb348bc8837b31d155d549d0b80180efda6e8bf0
--- src/cmd/gzip/gunzip.c
+++ src/cmd/gzip/gunzip.c
@@ -8,13 +8,13 @@ typedef struct	GZHead	GZHead;
 
 struct GZHead
 {
-	ulong	mtime;
+	u32int	mtime;
 	char	*file;
 };
 
 static	int	crcwrite(void *bout, void *buf, int n);
 static	int	get1(Biobuf *b);
-static	ulong	get4(Biobuf *b);
+static	u32int	get4(Biobuf *b);
 static	int	gunzipf(char *file, int stdout);
 static	int	gunzip(int ofd, char *ofile, Biobuf *bin);
 static	void	header(Biobuf *bin, GZHead *h);
@@ -23,8 +23,8 @@ static	void	error(char*, ...);
 /* #pragma	varargck	argpos	error	1 */
 
 static	Biobuf	bin;
-static	ulong	crc;
-static	ulong	*crctab;
+static	u32int	crc;
+static	u32int	*crctab;
 static	int	debug;
 static	char	*delfile;
 static	vlong	gzok;
@@ -33,7 +33,7 @@ static	int	settimes;
 static	int	table;
 static	int	verbose;
 static	int	wbad;
-static	ulong	wlen;
+static	u32int	wlen;
 static	jmp_buf	zjmp;
 
 void
@@ -277,7 +277,7 @@ header(Biobuf *bin, GZHead *h)
 static void
 trailer(Biobuf *bin, long wlen)
 {
-	ulong tcrc;
+	u32int tcrc;
 	long len;
 
 	tcrc = get4(bin);
@@ -290,10 +290,10 @@ trailer(Biobuf *bin, long wlen)
 		error("bad output length: expected %lud got %lud", wlen, len);
 }
 
-static ulong
+static u32int
 get4(Biobuf *b)
 {
-	ulong v;
+	u32int v;
 	int i, c;
 
 	v = 0;
blob - 4379f405aeae2e84c6cf77110ed30574825b40fc
blob + 039b3d442164efbe8de8f8ffe6caa7741dabe700
--- src/cmd/gzip/gzip.c
+++ src/cmd/gzip/gzip.c
@@ -10,12 +10,12 @@ static	int	crcread(void *fd, void *buf, int n);
 static	int	gzwrite(void *bout, void *buf, int n);
 
 static	Biobuf	bout;
-static	ulong	crc;
-static	ulong	*crctab;
+static	u32int	crc;
+static	u32int	*crctab;
 static	int	debug;
 static	int	eof;
 static	int	level;
-static	ulong	totr;
+static	u32int	totr;
 static	int	verbose;
 
 void
blob - ad43154f5eefa17cfbfc582e0f2efab1e7fca2cf
blob + 4075ea6887b932d4ec63fb271a954ff31c79f36e
--- src/cmd/gzip/unzip.c
+++ src/cmd/gzip/unzip.c
@@ -15,7 +15,7 @@ static	int	crcwrite(void *ofd, void *buf, int n);
 static	int	findCDir(Biobuf *bin, char *file);
 static	int	get1(Biobuf *b);
 static	int	get2(Biobuf *b);
-static	ulong	get4(Biobuf *b);
+static	u32int	get4(Biobuf *b);
 static	char	*getname(Biobuf *b, int len);
 static	int	header(Biobuf *bin, ZipHead *zh);
 static	long	msdos2time(int time, int date);
@@ -27,24 +27,24 @@ static	int	unzipEntry(Biobuf *bin, ZipHead *czh);
 static	int	unztable(Biobuf *bin, char *file);
 static	int	wantFile(char *file);
 
-static	void	*emalloc(ulong);
+static	void	*emalloc(u32int);
 static	void	error(char*, ...);
 /* #pragma	varargck	argpos	error	1 */
 
 static	Biobuf	bin;
-static	ulong	crc;
-static	ulong	*crctab;
+static	u32int	crc;
+static	u32int	*crctab;
 static	int	debug;
 static	char	*delfile;
 static	int	lower;
 static	int	nwant;
-static	ulong	rlen;
+static	u32int	rlen;
 static	int	settimes;
 static	int	stdout;
 static	int	verbose;
 static	char	**want;
 static	int	wbad;
-static	ulong	wlen;
+static	u32int	wlen;
 static	jmp_buf	zjmp;
 
 static void
@@ -190,7 +190,7 @@ sunztable(Biobuf *bin)
 {
 	ZipHead zh;
 	vlong off;
-	ulong hcrc, hcsize, huncsize;
+	u32int hcrc, hcsize, huncsize;
 	int ok, err;
 
 	ok = 1;
@@ -545,7 +545,7 @@ findCDir(Biobuf *bin, char *file)
 static int
 cheader(Biobuf *bin, ZipHead *zh)
 {
-	ulong v;
+	u32int v;
 	int flen, xlen, fclen;
 
 	v = get4(bin);
@@ -587,7 +587,7 @@ cheader(Biobuf *bin, ZipHead *zh)
 static int
 header(Biobuf *bin, ZipHead *zh)
 {
-	ulong v;
+	u32int v;
 	int flen, xlen;
 
 	v = get4(bin);
@@ -679,10 +679,10 @@ copyout(int ofd, Biobuf *bin, long len)
 	return 1;
 }
 
-static ulong
+static u32int
 get4(Biobuf *b)
 {
-	ulong v;
+	u32int v;
 	int i, c;
 
 	v = 0;
@@ -739,7 +739,7 @@ msdos2time(int time, int date)
 }
 
 static void*
-emalloc(ulong n)
+emalloc(u32int n)
 {
 	void *p;
 
blob - 73fb7db595657e570846da95a2ce23084fc155c6
blob + 5480ba8454136bf90b228b234357d509525831e0
--- src/cmd/gzip/zip.c
+++ src/cmd/gzip/zip.c
@@ -13,7 +13,7 @@ static	void	zip(Biobuf *bout, char *file, int stdout);
 static	void	zipDir(Biobuf *bout, int fd, ZipHead *zh, int stdout);
 static	int	crcread(void *fd, void *buf, int n);
 static	int	zwrite(void *bout, void *buf, int n);
-static	void	put4(Biobuf *b, ulong v);
+static	void	put4(Biobuf *b, u32int v);
 static	void	put2(Biobuf *b, int v);
 static	void	put1(Biobuf *b, int v);
 static	void	header(Biobuf *bout, ZipHead *zh);
@@ -24,14 +24,14 @@ static	void	error(char*, ...);
 /* #pragma	varargck	argpos	error	1 */
 
 static	Biobuf	bout;
-static	ulong	crc;
-static	ulong	*crctab;
+static	u32int	crc;
+static	u32int	*crctab;
 static	int	debug;
 static	int	eof;
 static	int	level;
 static	int	nzheads;
-static	ulong	totr;
-static	ulong	totw;
+static	u32int	totr;
+static	u32int	totw;
 static	int	verbose;
 static	int	zhalloc;
 static	ZipHead	*zheads;
@@ -353,7 +353,7 @@ zwrite(void *bout, void *buf, int n)
 }
 
 static void
-put4(Biobuf *b, ulong v)
+put4(Biobuf *b, u32int v)
 {
 	int i;
 
blob - 5d3c4338e216227ed4a7a16409ab7f60db1d7308
blob + e9354f7b4f80daa4b10e09b11d736624deba022b
--- src/cmd/tapefs/zipfs.c
+++ src/cmd/tapefs/zipfs.c
@@ -29,7 +29,7 @@ struct Block{
 };
 
 static Biobuf *bin;
-static ulong *crctab;
+static u32int *crctab;
 static ulong crc;
 
 static int findCDir(Biobuf *);
blob - 81ab14c0c9f8cd3919b7a7a6958d26509ea2be0c
blob + ca456415c088f15161f5a4bc204db755a722ec24
--- src/cmd/venti/srv/png.c
+++ src/cmd/venti/srv/png.c
@@ -30,7 +30,7 @@ struct ZlibW
 	uchar *e;
 };
 
-static ulong *crctab;
+static u32int *crctab;
 static uchar PNGmagic[] = { 137, 'P', 'N', 'G', '\r', '\n', 26, '\n'};
 
 static void