From d99b2f34e69bc363c2973a2473e75654196ab40e Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 26 Mar 2004 19:20:10 +0000
Subject: Sometimes it's amazing these haven't been turned up by other
 compilers.

---
 CHANGES           | 2 ++
 src/lib9/notify.c | 2 +-
 src/libbio/bfmt.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index a12931e8..fc81fa98 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,8 @@ March 26, 2004
 
 	9term OpenBSD support from Markus Friedl.
 
+	More appeasement of Sun C compiler.
+
 March 25, 2004
 
 	Change putenv not to free the string after calling real putenv.
diff --git a/src/lib9/notify.c b/src/lib9/notify.c
index 4d2a79ef..12edb0e4 100644
--- a/src/lib9/notify.c
+++ b/src/lib9/notify.c
@@ -69,7 +69,7 @@ notify(void (*f)(void*, char*))
 	struct sigaction sa;
 
 	memset(&sa, 0, sizeof sa);
-	if(f == nil)
+	if(f == 0)
 		sa.sa_handler = SIG_DFL;
 	else{
 		notifyf = f;
diff --git a/src/libbio/bfmt.c b/src/libbio/bfmt.c
index f1b6f5ab..4e0b6206 100644
--- a/src/libbio/bfmt.c
+++ b/src/libbio/bfmt.c
@@ -7,7 +7,7 @@ _Bfmtflush(Fmt *f)
 	Biobuf *b;
 
 	b = f->farg;
-	b->ocount = f->to - f->stop;
+	b->ocount = (char*)f->to - (char*)f->stop;
 	if(Bflush(b) < 0)
 		return 0;
 	f->to = b->ebuf+b->ocount;
-- 
cgit v1.2.3