more little compile fixes

src/cmd/acid/acid.h

@@ -256,7 +256,6 @@ void	unwind(void);
 void	userinit(void);
 void	varreg(void);
 void	varsym(void);
-Waitmsg*	waitfor(int);
 void	whatis(Lsym*);
 void	windir(Map*, Node*, Node*, Node*);
 void	yyerror(char*, ...);

src/cmd/acid/proc.c

@@ -245,17 +245,3 @@ getstatus(int pid)
 	return buf+56;			/* ditto */
 }
 
-Waitmsg*
-waitfor(int pid)
-{
-	Waitmsg *w;
-
-	for(;;) {
-		if((w = wait()) == nil)
-			error("wait %r");
-		if(w->pid == pid)
-			return w;
-		free(w);
-	}
-	return nil;	/* ken */
-}

src/cmd/mk/fns.h

@@ -1,3 +1,6 @@
+#undef waitfor
+#define waitfor mkwaitfor
+
 void	addrule(char*, Word*, char*, Word*, int, int, char*);
 void	addrules(Word*, Word*, char*, int, int, char*);
 void	addw(Word*, char*);

src/cmd/sam/sam.h

@@ -3,6 +3,9 @@
 #include <plumb.h>
 #include "errors.h"
 
+#undef waitfor
+#define waitfor samwaitfor
+
 /*
  * BLOCKSIZE is relatively small to keep memory consumption down.
  */

src/cmd/sam/unix.c

@@ -177,16 +177,20 @@ tempdisk(void)
         return fd; 
 }
 
-#undef wait
+#undef waitfor
 int     
-waitfor(int pid)
+samwaitfor(int pid)
 {
-        int wm; 
-        int rpid;
-                
-        do; while((rpid = wait(&wm)) != pid && rpid != -1);
-        return (WEXITSTATUS(wm));
-}       
+	int r;
+	Waitmsg *w;
+
+	w = p9waitfor(pid);
+	if(w == nil)
+		return -1;
+	r = atoi(w->msg);
+	free(w);
+	return r;
+}
 
 void
 samerr(char *buf)