6 files changed, 7 insertions, 6 deletions
diff --git a/src/cmd/acid/lex.c b/src/cmd/acid/lex.c
index e47452a4..ed7f459d 100644
--- a/src/cmd/acid/lex.c
+++ b/src/cmd/acid/lex.c
@@ -253,7 +253,7 @@ lexc(void)
 }
 
 int
-escchar(char c)
+escchar(int c)
 {
 	int n;
 	char buf[Strsize];
diff --git a/src/cmd/cb/cb.c b/src/cmd/cb/cb.c
index bddc5d21..761ccf12 100644
--- a/src/cmd/cb/cb.c
+++ b/src/cmd/cb/cb.c
@@ -56,7 +56,7 @@ work(void){
 	int c;
 	struct keyw *lptr;
 	char *pt;
-	char cc;
+	int cc;
 	int ct;
 
 	while ((c = getch()) != Beof){
diff --git a/src/cmd/graph/graph.c b/src/cmd/graph/graph.c
index 01c8bc66..3e740cb0 100644
--- a/src/cmd/graph/graph.c
+++ b/src/cmd/graph/graph.c
@@ -258,7 +258,7 @@ numb(float *np, int *argcp, char ***argvp){
 		return(0);
 	while((c=(*argvp)[1][0]) == '+')
 		(*argvp)[1]++;
-	if(!(isdigit(c) || c=='-'&&(*argvp)[1][1]<'A' || c=='.'))
+	if(!(isdigit((uchar)c) || c=='-'&&(*argvp)[1][1]<'A' || c=='.'))
 		return(0);
 	*np = atof((*argvp)[1]);
 	(*argcp)--;
diff --git a/src/cmd/tbl/t5.c b/src/cmd/tbl/t5.c
index 8b7a65d8..3b12d98f 100644
--- a/src/cmd/tbl/t5.c
+++ b/src/cmd/tbl/t5.c
@@ -23,7 +23,7 @@ gettbl(void)
 			break;
 		}
 		fullbot[nlin] = 0;
-		if (cstore[0] == '.' && !isdigit(cstore[1])) {
+		if (cstore[0] == '.' && !isdigit((uchar)cstore[1])) {
 			instead[nlin] = cstore;
 			while (*cstore++)
 				;
diff --git a/src/cmd/tbl/t9.c b/src/cmd/tbl/t9.c
index 379126d2..69e9d6c7 100644
--- a/src/cmd/tbl/t9.c
+++ b/src/cmd/tbl/t9.c
@@ -29,7 +29,7 @@ domore(char *dataln)
 
 	if (prefix(".TE", dataln))
 		return(0);
-	if (dataln[0] == '.' && !isdigit(dataln[1])) {
+	if (dataln[0] == '.' && !isdigit((uchar)dataln[1])) {
 		Bprint(&tabout, "%s\n", dataln);
 		return(1);
 	}
diff --git a/src/cmd/troff/n10.c b/src/cmd/troff/n10.c
index 91579480..eaa5a57a 100644
--- a/src/cmd/troff/n10.c
+++ b/src/cmd/troff/n10.c
@@ -4,6 +4,7 @@ n10.c
 Device interfaces
 */
 
+#include <u.h>
 #include "tdef.h"
 #include "ext.h"
 #include "fns.h"
@@ -48,7 +49,7 @@ static char *parse(char *s, int typeit)	/* convert \0, etc to nroff driving tabl
 			*t++ = *s++;
 		else {
 			s++;	/* skip \\ */
-			if (isdigit(s[0]) && isdigit(s[1]) && isdigit(s[2])) {
+			if (isdigit((uchar)s[0]) && isdigit((uchar)s[1]) && isdigit((uchar)s[2])) {
 				*t++ = (s[0]-'0')<<6 | (s[1]-'0')<<3 | s[2]-'0';
 				s += 2;
 			} else if (isdigit(s[0])) {