merge

2012-03-05 16:36:31 -05:00
parent a319037781 a319037781
commit 4a000a28d3
12 changed files with 134 additions and 18 deletions
--- a/src/cmd/acid/exec.c
+++ b/src/cmd/acid/exec.c
@@ -203,7 +203,7 @@ convflt(Node *r, char *flt)
 }

 void
-indir(Map *m, ulong addr, char fmt, Node *r)
+indir(Map *m, u64int addr, char fmt, Node *r)
 {
 	int i;
 	u32int ival;