=================================================================== RCS file: /cvs/mandoc/mandoc.h,v retrieving revision 1.201 retrieving revision 1.202 diff -u -p -r1.201 -r1.202 --- mandoc/mandoc.h 2015/02/23 13:31:04 1.201 +++ mandoc/mandoc.h 2015/04/18 16:06:40 1.202 @@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.201 2015/02/23 13:31:04 schwarze Exp $ */ +/* $Id: mandoc.h,v 1.202 2015/04/18 16:06:40 schwarze Exp $ */ /* * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons * Copyright (c) 2010-2015 Ingo Schwarze @@ -7,9 +7,9 @@ * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF @@ -412,8 +412,7 @@ __BEGIN_DECLS struct mparse; struct mchars; -struct mdoc; -struct man; +struct roff_man; enum mandoc_esc mandoc_escape(const char **, const char **, int *); struct mchars *mchars_alloc(void); @@ -434,8 +433,8 @@ enum mandoclevel mparse_readfd(struct mparse *, int, enum mandoclevel mparse_readmem(struct mparse *, void *, size_t, const char *); void mparse_reset(struct mparse *); -void mparse_result(struct mparse *, - struct mdoc **, struct man **, char **); +void mparse_result(struct mparse *, struct roff_man **, + struct roff_man **, char **); const char *mparse_getkeep(const struct mparse *); const char *mparse_strerror(enum mandocerr); const char *mparse_strlevel(enum mandoclevel);