20070407-1350 more updates from plan 9 pc kernel, and a few unreachable fixes(!)

1 files changed, 3 insertions, 2 deletions

diff --git a/os/port/lib.h b/os/port/lib.h
index c9414b5a..e50fd8cb 100644
--- a/os/port/lib.h
+++ b/os/port/lib.h
@@ -2,9 +2,9 @@
 /*
  * functions (possibly) linked in, complete, from libc.
  */
-#define nelem(n)	(sizeof(n)/sizeof(n[0]))
+#define nelem(x)	(sizeof(x)/sizeof((x)[0]))
 #define offsetof(s, m)	(ulong)(&(((s*)0)->m))
-#define	assert(x)	if(x){}else _assert("x")
+#define assert(x)	if(x){}else _assert("x")
 
 /*
  * mem routines
@@ -123,6 +123,7 @@ extern	char	end[];
 extern	int	getfields(char*, char**, int, int, char*);
 extern	int	tokenize(char*, char**, int);
 extern	int	dec64(uchar*, int, char*, int);
+extern	void	qsort(void*, long, long, int (*)(void*, void*));
 
 extern	int	toupper(int);
 extern	char*	netmkaddr(char*, char*, char*);