commit - d912fcd8b713ec9ceddf1ccfa2ac4e4755872555
commit + 430976597fd86013e1e8b74e4cd78e7259b31272
blob - cf7aa9f9c461c92463404cd7192d4c953541f139
blob + 982eea18b9641657e67dd405788703408cf282e1
--- src/cmd/9term/dat.h
+++ src/cmd/9term/dat.h
@@ -2,6 +2,9 @@
 #undef Borderwidth
 #define Borderwidth 0
 
+#undef TRUE	/* OS X */
+#undef FALSE
+
 typedef	struct	Consreadmesg Consreadmesg;
 typedef	struct	Conswritemesg Conswritemesg;
 typedef	struct	Stringpair Stringpair;
blob - a443c3925df8c16c6339cae030159f38dc563a0e
blob + 74cbfabeda682df91c2f28641ab36e4da88bab61
--- src/cmd/vbackup/mount-BSD.c
+++ src/cmd/vbackup/mount-BSD.c
@@ -48,7 +48,7 @@ mountnfs(int proto, struct sockaddr_in *sa,
 	na.retrans = NFS_RETRANS;
 	na.maxgrouplist = NFS_MAXGRPS;
 	na.hostname = "backup";
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__APPLE__)
 	na.acregmin = 60;
 	na.acregmax = 600;
 	na.acdirmin = 60;