From 6b2d0fd94642d4e041bffac34cb79eaf9169760b Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 26 Mar 2004 03:45:55 +0000
Subject: Bug fixes from Scott Schwartz.

Try to make 9term not crash when X errors happen.
---
 src/cmd/dict/world.c | 2 ++
 src/cmd/ed.c         | 2 ++
 src/cmd/mc.c         | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/cmd')

diff --git a/src/cmd/dict/world.c b/src/cmd/dict/world.c
index 19f3fb10..dba84e77 100644
--- a/src/cmd/dict/world.c
+++ b/src/cmd/dict/world.c
@@ -11,6 +11,8 @@
 
 #define	GSHORT(p)	(((p)[0]<<8)|(p)[1])
 
+#define putchar dictputchar
+
 static void	putchar(int, int*);
 
 #define	NONE	0xffff
diff --git a/src/cmd/ed.c b/src/cmd/ed.c
index 42fa3e07..1c1639b9 100644
--- a/src/cmd/ed.c
+++ b/src/cmd/ed.c
@@ -6,6 +6,8 @@
 #include <bio.h>
 #include <regexp.h>
 
+#undef EOF	/* stdio? */
+
 enum
 {
 	FNSIZE	= 128,		/* file name */
diff --git a/src/cmd/mc.c b/src/cmd/mc.c
index ebe8b81c..45e7adf4 100644
--- a/src/cmd/mc.c
+++ b/src/cmd/mc.c
@@ -8,10 +8,11 @@
  *
  */
 #include	<u.h>
+#include	<sys/ioctl.h>
+#include	<sys/termios.h>
 #include	<libc.h>
 #include	<draw.h>
 #include	<bio.h>
-#include	<sys/ioctl.h>
 
 #define	WIDTH			80
 #define	TAB	4
-- 
cgit v1.2.3