darwin

src/cmd/9pserve.c

@@ -4,6 +4,8 @@
 #include <thread.h>
 #include <errno.h>
 
+#define err err9pserve /* Darwin x86 */
+
 enum
 {
 	STACK = 32768,

src/cmd/proof/proof.h

@@ -1,5 +1,6 @@
 #include <cursor.h>
 #undef isspace
+#define isspace proofisspace
 #define	NPAGES	500
 #define NFONT	33
 #define NSIZE	40

src/cmd/sam/sam.h

@@ -6,6 +6,9 @@
 #undef waitfor
 #define waitfor samwaitfor
 
+#undef warn
+#define warn samwarn
+
 /*
  * BLOCKSIZE is relatively small to keep memory consumption down.
  */