commit d9ed72433f25ec45908dede1022425a3f3ed1c67
author rsc <devnull@localhost> Fri Apr 21 04:26:02 2006 +0000
committer rsc <devnull@localhost> Fri Apr 21 04:26:02 2006 +0000
tree 267092b7e0b5dd3c6f719dafe5456de56cc04bc2
parent 4e3a81b98b7fe89d4e081be810f76f87300c11e5

darwin

src/cmd/9pserve.c

diff --git a/src/cmd/9pserve.c b/src/cmd/9pserve.c
index 07ed8e0..623b966 100644
--- a/src/cmd/9pserve.c
+++ b/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

diff --git a/src/cmd/proof/proof.h b/src/cmd/proof/proof.h
index 72d5508..a7e2fd1 100644
--- a/src/cmd/proof/proof.h
+++ b/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

diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h
index 4033915..ca92c48 100644
--- a/src/cmd/sam/sam.h
+++ b/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.
  */