From 97ded0fd3ae09474f95b496ada9be448a4ec3eac Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 2 Apr 2010 12:39:48 +0000 Subject: merge 1.9.22, keeping local patches * convert mdoc tokens from #define to enum * fix a segfault with .Xo/.Xc in explicit blocks * Thorn is \*(Th, not \*(TH; noticed by Joerg Sonnenberger --- usr.bin/mandoc/mdoc_validate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.bin/mandoc/mdoc_validate.c') diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c index 34cc96c9423..dbac32284ed 100644 --- a/usr.bin/mandoc/mdoc_validate.c +++ b/usr.bin/mandoc/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.43 2010/03/02 00:38:59 schwarze Exp $ */ +/* $Id: mdoc_validate.c,v 1.44 2010/04/02 12:39:47 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -40,7 +40,7 @@ struct valids { v_post *post; }; -static int check_parent(PRE_ARGS, int, enum mdoc_type); +static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type); static int check_msec(PRE_ARGS, ...); static int check_sec(PRE_ARGS, ...); static int check_stdarg(PRE_ARGS); @@ -544,7 +544,7 @@ check_text(struct mdoc *mdoc, int line, int pos, const char *p) static int -check_parent(PRE_ARGS, int tok, enum mdoc_type t) +check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) { assert(n->parent); -- cgit v1.2.3