tmore little compile fixes - plan9port - [fork] Plan 9 from user space
 (HTM) git clone git://src.adamsgaard.dk/plan9port
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 22c7ebffdade6036f5b46347f6a6ca41023c6253
 (DIR) parent 7ffc5208a82cd7339c125956a9702ac08c0ff2f4
 (HTM) Author: rsc <devnull@localhost>
       Date:   Tue, 28 Dec 2004 01:45:05 +0000
       
       more little compile fixes
       
       Diffstat:
         M src/cmd/acid/acid.h                 |       1 -
         M src/cmd/acid/proc.c                 |      14 --------------
         M src/cmd/mk/fns.h                    |       3 +++
         M src/cmd/sam/sam.h                   |       3 +++
         M src/cmd/sam/unix.c                  |      20 ++++++++++++--------
         M src/libsec/port/aes.c               |       4 ++--
       
       6 files changed, 20 insertions(+), 25 deletions(-)
       ---
 (DIR) diff --git a/src/cmd/acid/acid.h b/src/cmd/acid/acid.h
       t@@ -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*, ...);
 (DIR) diff --git a/src/cmd/acid/proc.c b/src/cmd/acid/proc.c
       t@@ -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 */
       -}
 (DIR) diff --git a/src/cmd/mk/fns.h b/src/cmd/mk/fns.h
       t@@ -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*);
 (DIR) diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h
       t@@ -3,6 +3,9 @@
        #include <plumb.h>
        #include "errors.h"
        
       +#undef waitfor
       +#define waitfor samwaitfor
       +
        /*
         * BLOCKSIZE is relatively small to keep memory consumption down.
         */
 (DIR) diff --git a/src/cmd/sam/unix.c b/src/cmd/sam/unix.c
       t@@ -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)
 (DIR) diff --git a/src/libsec/port/aes.c b/src/libsec/port/aes.c
       t@@ -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]);