From d9ed72433f25ec45908dede1022425a3f3ed1c67 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 21 Apr 2006 04:26:02 +0000
Subject: darwin

---
 src/cmd/9pserve.c     | 2 ++
 src/cmd/proof/proof.h | 1 +
 src/cmd/sam/sam.h     | 3 +++
 3 files changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/cmd/9pserve.c b/src/cmd/9pserve.c
index 07ed8e08..623b966a 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,
diff --git a/src/cmd/proof/proof.h b/src/cmd/proof/proof.h
index 72d55083..a7e2fd14 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
diff --git a/src/cmd/sam/sam.h b/src/cmd/sam/sam.h
index 40339150..ca92c48d 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.
  */
-- 
cgit v1.2.3