6 files changed, 13 insertions, 1 deletions
diff --git a/src/cmd/acme/dat.h b/src/cmd/acme/dat.h
index 97953325..4ac0d676 100644
--- a/src/cmd/acme/dat.h
+++ b/src/cmd/acme/dat.h
@@ -465,6 +465,9 @@ enum
 #define	WIN(q)	((((ulong)(q).path)>>8) & 0xFFFFFF)
 #define	FILE(q)	((q).path & 0xFF)
 
+#undef FALSE
+#undef TRUE
+
 enum
 {
 	FALSE,
diff --git a/src/cmd/map/map.c b/src/cmd/map/map.c
index 47109d43..e8dd3ab3 100644
--- a/src/cmd/map/map.c
+++ b/src/cmd/map/map.c
@@ -105,6 +105,8 @@ double	diddle(struct place *, double, double);
 void	dobounds(double, double, double, double, int);
 void	dogrid(double, double, double, double);
 int	duple(struct place *, double);
+#define fmax map_fmax
+#define fmin map_fmin
 double	fmax(double, double);
 double	fmin(double, double);
 void	getdata(char *);
diff --git a/src/cmd/map/mkfile b/src/cmd/map/mkfile
index 4d272749..43f2205d 100644
--- a/src/cmd/map/mkfile
+++ b/src/cmd/map/mkfile
@@ -5,7 +5,6 @@ LIB=libmap/libmap.a
 OFILES=map.$O\
 	symbol.$O\
 	index.$O\
-	sqrt.$O\
 
 HFILES=map.h\
 	iplot.h\
diff --git a/src/cmd/pr.c b/src/cmd/pr.c
index 991572b1..2967e003 100644
--- a/src/cmd/pr.c
+++ b/src/cmd/pr.c
@@ -8,6 +8,7 @@
  *	2+head+2+page[56]+5
  */
 
+#define err		pr_err
 #define	ISPRINT(c)	((c) >= ' ')
 #define ESC		'\033'
 #define LENGTH		66
diff --git a/src/cmd/proof/proof.h b/src/cmd/proof/proof.h
index edd34991..72d55083 100644
--- a/src/cmd/proof/proof.h
+++ b/src/cmd/proof/proof.h
@@ -10,6 +10,8 @@
 #define	ONES	~0
 
 #define devname proof_devname
+#define getc	proof_getc
+#define ungetc	proof_ungetc
 
 extern	char	devname[];
 extern	double	mag;
diff --git a/src/cmd/vac/error.h b/src/cmd/vac/error.h
index bbb97373..3d6c7f8d 100644
--- a/src/cmd/vac/error.h
+++ b/src/cmd/vac/error.h
@@ -1,3 +1,8 @@
+/*
+ * Somehow <errno.h> has been included on Mac OS X
+ */
+#undef EIO
+
 extern char ENoDir[];
 extern char EBadDir[];
 extern char EBadMeta[];