commit 478ee9636fcfe3509d0a901d1250524a5c41d3a8
from: rsc <devnull@localhost>
date: Sun Nov 23 20:04:53 2003 UTC

Make things build on FreeBSD again.

commit - 1c253ceb586c4519f42ce115954c4efab787f81a
commit + 478ee9636fcfe3509d0a901d1250524a5c41d3a8
blob - 41e4fbf4367f50bf1ec7e1275c0e2aa75eee7fc4
blob + c9446d6b9108992da4d2888d6d6f45204ab428a5
--- src/cmd/diff/diffdir.c
+++ src/cmd/diff/diffdir.c
@@ -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);
 }
blob - 44594dc00e86c4274e25e9915e96ce33a15e91bc
blob + 4502751364cb546f3723327715f7afd19051a9ce
--- src/lib9/_p9dialparse.c
+++ src/lib9/_p9dialparse.c
@@ -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)
 
blob - 0903c57d13efdd5122ef8848fa1460d2b2008e2d
blob + d94208ccbb81a5f6859c74fd2d717504e4c4e9c7
--- src/lib9/_p9dir.c
+++ src/lib9/_p9dir.c
@@ -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>
@@ -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)
 {
blob - dda9c8a52a95e96a1eee6824a84b4cb188b6cc91
blob + ac1cac21244f0f71f11e8184a23073933a419094
--- src/libsec/port/aes.c
+++ src/libsec/port/aes.c
@@ -950,6 +950,7 @@ static int rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/],
 	return 0;
 }
 
+#if 0
 /**
  * Expand the cipher key into the decryption key schedule.
  *
@@ -994,6 +995,7 @@ static int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/],
 	}
 	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;
blob - bb2f3cb33d66397f20f52d38c6a91955fa477988
blob + 1d5794463f368beb40cd291c3645237478c42f85
--- src/libsec/port/md5.c
+++ src/libsec/port/md5.c
@@ -28,7 +28,6 @@
  */
 
 static void encode(uchar*, u32int*, ulong);
-static void decode(u32int*, uchar*, ulong);
 
 extern void _md5block(uchar*, ulong, u32int*);
 
blob - 222d8c25d7705c2e9aac168c021023caf04b337b
blob + 5e5dcb2b6b548a89a1af0326e1cc2e513748dd35
--- src/libthread/proctab.c
+++ src/libthread/proctab.c
@@ -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);
blob - a896be23daa59d88da4c567f51b3e4f7c2182ba1
blob + 23e34efe36f7ce04feb453fc123033fcba2b71c9
--- src/mkfile
+++ src/mkfile
@@ -13,7 +13,7 @@ DIRS=\
 	libthread\
 	libutf\
 	libventi\
-#	cmd\
+	cmd\
 
 <mkdirs
 
blob - d1b65729598827f1c3964d65f899e3aacc5d0c94
blob + 3b0384e0d66dbe76edb10768cbacc2d7e27e7cd2
--- src/mkhdr
+++ src/mkhdr
@@ -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