===================================================================
RCS file: /cvs/mandoc/libmandoc.h,v
retrieving revision 1.61
retrieving revision 1.66
diff -u -p -r1.61 -r1.66
--- mandoc/libmandoc.h	2015/10/13 22:59:54	1.61
+++ mandoc/libmandoc.h	2017/02/18 13:43:52	1.66
@@ -1,4 +1,4 @@
-/*	$Id: libmandoc.h,v 1.61 2015/10/13 22:59:54 schwarze Exp $ */
+/*	$Id: libmandoc.h,v 1.66 2017/02/18 13:43:52 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,22 +32,18 @@ struct	buf {
 	size_t	 sz;
 };
 
-__BEGIN_DECLS
 
 struct	mparse;
 struct	tbl_span;
 struct	eqn;
 struct	roff;
 struct	roff_man;
-struct	roff_node;
 
 void		 mandoc_msg(enum mandocerr, struct mparse *,
 			int, int, const char *);
-#if __GNUC__ - 0 >= 4
-__attribute__((__format__ (__printf__, 5, 6)))
-#endif
 void		 mandoc_vmsg(enum mandocerr, struct mparse *,
-			int, int, const char *, ...);
+			int, int, const char *, ...)
+			__attribute__((__format__ (__printf__, 5, 6)));
 char		*mandoc_getarg(struct mparse *, char **, int, int *);
 char		*mandoc_normdate(struct mparse *, char *, int, int);
 int		 mandoc_eos(const char *, size_t);
@@ -63,7 +59,7 @@ int		 man_parseln(struct roff_man *, int, char *, int)
 void		 man_endparse(struct roff_man *);
 
 int		 preconv_cue(const struct buf *, size_t);
-int		 preconv_encode(struct buf *, size_t *,
+int		 preconv_encode(const struct buf *, size_t *,
 			struct buf *, size_t *, int *);
 
 void		 roff_free(struct roff *);
@@ -84,5 +80,3 @@ int		 roff_getformat(const struct roff *);
 
 const struct tbl_span	*roff_span(const struct roff *);
 const struct eqn	*roff_eqn(const struct roff *);
-
-__END_DECLS