--- src/lib/libc/gen/unvis.c	2005/11/13 00:07:42	1.4
+++ src/lib/libc/gen/unvis.c	2005/11/19 22:32:53	1.5
@@ -37,6 +37,7 @@
  */
 
 #include <sys/types.h>
+#include <ctype.h>
 #include <vis.h>
 
 /*
@@ -54,7 +55,7 @@
 #define	S_HTTP		0x080	/* %HEXHEX escape */
 
 #define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define	ishex(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '9' || ((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f')
+#define	ishex(c)	((((u_char)(c)) >= '0' && ((u_char)(c)) <= '9') || (((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f'))
 
 /*
  * unvis - decode characters previously encoded by vis
@@ -105,7 +106,7 @@ unvis(char *cp, int c, int *astate, int
 			*astate = S_OCTAL2;
 			return (0);
 		case 'M':
-			*cp = 0200;
+			*cp = (char)0200;
 			*astate = S_META;
 			return (0);
 		case '^':