===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_hash.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mandoc/Attic/mdoc_hash.c	2011/03/22 14:33:05	1.17
+++ mandoc/Attic/mdoc_hash.c	2011/07/24 18:15:14	1.18
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_hash.c,v 1.17 2011/03/22 14:33:05 kristaps Exp $ */
+/*	$Id: mdoc_hash.c,v 1.18 2011/07/24 18:15:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,7 +31,7 @@
 #include "mandoc.h"
 #include "libmdoc.h"
 
-static	u_char		 table[27 * 12];
+static	unsigned char	 table[27 * 12];
 
 /*
  * XXX - this hash has global scope, so if intended for use as a library
@@ -48,14 +48,14 @@ mdoc_hash_init(void)
 	for (i = 0; i < (int)MDOC_MAX; i++) {
 		p = mdoc_macronames[i];
 
-		if (isalpha((u_char)p[1]))
-			major = 12 * (tolower((u_char)p[1]) - 97);
+		if (isalpha((unsigned char)p[1]))
+			major = 12 * (tolower((unsigned char)p[1]) - 97);
 		else
 			major = 12 * 26;
 
 		for (j = 0; j < 12; j++)
 			if (UCHAR_MAX == table[major + j]) {
-				table[major + j] = (u_char)i;
+				table[major + j] = (unsigned char)i;
 				break;
 			}
 
@@ -70,11 +70,11 @@ mdoc_hash_find(const char *p)
 
 	if (0 == p[0])
 		return(MDOC_MAX);
-	if ( ! isalpha((u_char)p[0]) && '%' != p[0])
+	if ( ! isalpha((unsigned char)p[0]) && '%' != p[0])
 		return(MDOC_MAX);
 
-	if (isalpha((u_char)p[1]))
-		major = 12 * (tolower((u_char)p[1]) - 97);
+	if (isalpha((unsigned char)p[1]))
+		major = 12 * (tolower((unsigned char)p[1]) - 97);
 	else if ('1' == p[1])
 		major = 12 * 26;
 	else