tMake things build on FreeBSD again. - 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 478ee9636fcfe3509d0a901d1250524a5c41d3a8
 (DIR) parent 1c253ceb586c4519f42ce115954c4efab787f81a
 (HTM) Author: rsc <devnull@localhost>
       Date:   Sun, 23 Nov 2003 20:04:53 +0000
       
       Make things build on FreeBSD again.
       
       Diffstat:
         M src/cmd/diff/diffdir.c              |       4 ++--
         M src/lib9/_p9dialparse.c             |       8 +++++---
         M src/lib9/_p9dir.c                   |       9 +++++----
         M src/libsec/port/aes.c               |       2 ++
         M src/libsec/port/md5.c               |       1 -
         M src/libthread/proctab.c             |      10 ----------
         M src/mkfile                          |       2 +-
         M src/mkhdr                           |       2 +-
       
       8 files changed, 16 insertions(+), 22 deletions(-)
       ---
 (DIR) diff --git a/src/cmd/diff/diffdir.c b/src/cmd/diff/diffdir.c
       t@@ -4,9 +4,9 @@
        #include "diff.h"
        
        static int
       -itemcmp(void *v1, void *v2)
       +itemcmp(const void *v1, const void *v2)
        {
       -        char **d1 = v1, **d2 = v2;
       +        char *const*d1 = v1, *const*d2 = v2;
        
                return strcmp(*d1, *d2);
        }
 (DIR) diff --git a/src/lib9/_p9dialparse.c b/src/lib9/_p9dialparse.c
       t@@ -1,9 +1,11 @@
       -#include <netdb.h>
       -#include <sys/un.h>
       -
        #include <u.h>
       +#define NOPLAN9DEFINES
        #include <libc.h>
        
       +#include <sys/types.h>
       +#include <netdb.h>
       +#include <sys/un.h>
       +
        static char *nets[] = { "tcp", "udp", nil };
        #define CLASS(p) ((*(uchar*)(p))>>6)
        
 (DIR) diff --git a/src/lib9/_p9dir.c b/src/lib9/_p9dir.c
       t@@ -1,3 +1,8 @@
       +#include <u.h>
       +#define NOPLAN9DEFINES
       +#include <libc.h>
       +
       +#include <sys/types.h>
        #include <sys/stat.h>
        #ifdef _HAVEDISKLABEL
        #include <sys/disklabel.h>
       t@@ -6,10 +11,6 @@
        #include <pwd.h>
        #include <grp.h>
        
       -#include <u.h>
       -#define NOPLAN9DEFINES
       -#include <libc.h>
       -
        int
        _p9dir(struct stat *st, char *name, Dir *d, char **str, char *estr)
        {
 (DIR) diff --git a/src/libsec/port/aes.c b/src/libsec/port/aes.c
       t@@ -950,6 +950,7 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
                return 0;
        }
        
       +#if 0
        /**
         * Expand the cipher key into the decryption key schedule.
         *
       t@@ -994,6 +995,7 @@ static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int
                }
                return Nr;
        }
       +#endif
        
        static void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16]) {
                u32 s0, s1, s2, s3, t0, t1, t2, t3;
 (DIR) diff --git a/src/libsec/port/md5.c b/src/libsec/port/md5.c
       t@@ -28,7 +28,6 @@
         */
        
        static void encode(uchar*, u32int*, ulong);
       -static void decode(u32int*, uchar*, ulong);
        
        extern void _md5block(uchar*, ulong, u32int*);
        
 (DIR) diff --git a/src/libthread/proctab.c b/src/libthread/proctab.c
       t@@ -26,17 +26,7 @@ __threadgetproc(int rm)
        {
                Proc **l, *p;
                int h, pid;
       -        Thread *t;
       -        ulong *s;
        
       -/* fails on linux, probably because the main stack
       - * has to be grown a page at a time instead of the big jump?
       -        s = (ulong*)((ulong)&pid & ~(STKSIZE-1));
       -        if(s[0] == STKMAGIC){
       -                t = (Thread*)s[1];
       -                return t->proc;
       -        }
       -*/
                pid = _threadgetpid();
        
                lock(&ptablock);
 (DIR) diff --git a/src/mkfile b/src/mkfile
       t@@ -13,7 +13,7 @@ DIRS=\
                libthread\
                libutf\
                libventi\
       -#        cmd\
       +        cmd\
        
        <mkdirs
        
 (DIR) diff --git a/src/mkhdr b/src/mkhdr
       t@@ -13,7 +13,7 @@ O=o
        BIN=$PLAN9/bin
        LIBDIR=$PLAN9/lib
        
       -<$PLAN9/src/mk.$SYSNAME-$OBJTYPE
       +<|cat $PLAN9/src/mk.$SYSNAME-$OBJTYPE 2>/dev/null || true
        
        OS=$O
        LD=9l