Commit Diff

Commit:
f7cca88267372c8a5a771923a19ea4f817113cf2
From:
David du Colombier <0intro@gmail.com>
Via:
Russ Cox <rsc@swtch.com>
Date:
Message:
libventi: import changes from plan 9 R=rsc CC=plan9port.codebot http://codereview.appspot.com/4530100
Actions:
Patch | Tree
commit - cbc99e3e52703f61aee028b34f135c2e05a6a5db
commit + f7cca88267372c8a5a771923a19ea4f817113cf2
blob - 1346126fe90a0ffe3ef0991aa76dd62db46cb738
blob + dea99a9d1a0abacef20424505f00549d516066ab
--- src/libventi/mem.c
+++ src/libventi/mem.c
@@ -54,8 +54,7 @@ vtbrk(int n)
 {
 	static Lock lk;
 	static uchar *buf;
-	static int nbuf;
-	static int nchunk;
+	static int nbuf, nchunk;
 	int align, pad;
 	void *p;
 
@@ -67,11 +66,11 @@ vtbrk(int n)
 		align = 4;
 
 	lock(&lk);
-	pad = (align - (ulong)buf) & (align-1);
+	pad = (align - (uintptr)buf) & (align-1);
 	if(n + pad > nbuf) {
 		buf = vtmallocz(ChunkSize);
 		nbuf = ChunkSize;
-		pad = (align - (ulong)buf) & (align-1);
+		pad = (align - (uintptr)buf) & (align-1);
 		nchunk++;
 	}