=================================================================== RCS file: /cvs/mandoc/Attic/mdocterm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- mandoc/Attic/mdocterm.c 2009/02/23 15:19:47 1.6 +++ mandoc/Attic/mdocterm.c 2009/02/23 15:34:53 1.7 @@ -1,4 +1,4 @@ - /* $Id: mdocterm.c,v 1.6 2009/02/23 15:19:47 kristaps Exp $ */ + /* $Id: mdocterm.c,v 1.7 2009/02/23 15:34:53 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -24,13 +24,19 @@ #include #include -#ifdef __linux__ +#ifndef __OpenBSD__ #include #endif #include "mmain.h" #include "term.h" +#ifdef __NetBSD__ +#define xisspace(x) isspace((int)(x)) +#else +#define xisspace(x) isspace((x)) +#endif + enum termstyle { STYLE_CLEAR, STYLE_BOLD, @@ -137,11 +143,11 @@ flushln(struct termp *p) * Count up visible word characters. Control sequences * (starting with the CSI) aren't counted. */ - assert( ! isspace(p->buf[i])); + assert( ! xisspace(p->buf[i])); /* LINTED */ for (j = i, vsz = 0; j < p->col; j++) { - if (isspace(p->buf[j])) + if (xisspace(p->buf[j])) break; else if (27 == p->buf[j]) { assert(j + 4 <= p->col); @@ -177,7 +183,7 @@ flushln(struct termp *p) */ for ( ; i < p->col; i++) { - if (isspace(p->buf[i])) + if (xisspace(p->buf[i])) break; putchar(p->buf[i]); } @@ -378,7 +384,7 @@ word(struct termp *p, const char *word) /* LINTED */ for (j = i = 0; i < len; i++) { - if ( ! isspace(word[i])) { + if ( ! xisspace(word[i])) { j++; continue; } @@ -444,10 +450,10 @@ footer(struct termp *p, const struct mdoc_meta *meta) tm = localtime(&meta->date); -#ifdef __linux__ - if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) -#else +#ifdef __OpenBSD__ if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm)) +#else + if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) #endif err(1, "strftime");