more little compile fixes

6 files changed, 20 insertions, 25 deletions

diff --git a/src/cmd/acid/acid.h b/src/cmd/acid/acid.h
index a26781c0..44718009 100644
--- a/src/cmd/acid/acid.h
+++ b/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*, ...);
diff --git a/src/cmd/acid/proc.c b/src/cmd/acid/proc.c
index 66996345..a0aed614 100644
--- a/src/cmd/acid/proc.c
+++ b/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 */
-}
diff --git a/src/cmd/mk/fns.h b/src/cmd/mk/fns.h
index 2c9f46a3..0a084a65 100644
--- a/src/cmd/mk/fns.h
+++ b/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*);
diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h
index 1ab2b495..0641be81 100644
--- a/src/cmd/sam/sam.h
+++ b/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.
  */
diff --git a/src/cmd/sam/unix.c b/src/cmd/sam/unix.c
index 162ba74f..2505f854 100644
--- a/src/cmd/sam/unix.c
+++ b/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)
diff --git a/src/libsec/port/aes.c b/src/libsec/port/aes.c
index cdcb9bb5..144aaf69 100644
--- a/src/libsec/port/aes.c
+++ b/src/libsec/port/aes.c
@@ -43,9 +43,9 @@ static const u32 Td3[256];
 static const u8  Te4[256];
 
 static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
-/*
+#ifdef NOTUSED
 static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
-*/
+#endif
 static int rijndaelKeySetup(u32 erk[/*4*(Nr + 1)*/], u32 drk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits);
 static void	rijndaelEncrypt(const u32int rk[], int Nr, const uchar pt[16], uchar ct[16]);
 static void	rijndaelDecrypt(const u32int rk[], int Nr, const uchar ct[16], uchar pt[16]);