From d5899efe4a68c00b14f7b4e40042b60c86db4898 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 24 Jul 2011 18:15:13 +0000 Subject: Scary-looking but otherwise harmless changes allow me to build for Windows. That is to say, with mingw32. This amounts to the following: (1) break compat.c into compat_strlcpy.c and compat_strlcat.c (2) add compat_getsubopt.c (from OpenBSD) and test-getsubopt.c (3) add test-strptime.c for HAVE_STRPTIME (4) add ifdef bits here and there, where necessary (5) remove some harmless unportable stuff (u_char, localtime_r) I've added the appropriate mdocml.zip target to the Makefile, too. --- mdoc_hash.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mdoc_hash.c') diff --git a/mdoc_hash.c b/mdoc_hash.c index a1a03094..59a8d26a 100644 --- a/mdoc_hash.c +++ b/mdoc_hash.c @@ -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 * @@ -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 -- cgit v1.2.3