===================================================================
RCS file: /cvs/mandoc/out.h,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -p -r1.24 -r1.28
--- mandoc/out.h	2014/10/14 02:16:06	1.24
+++ mandoc/out.h	2017/06/08 12:54:58	1.28
@@ -1,6 +1,7 @@
-/*	$Id: out.h,v 1.24 2014/10/14 02:16:06 schwarze Exp $ */
+/*	$Id: out.h,v 1.28 2017/06/08 12:54:58 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef OUT_H
-#define OUT_H
 
 enum	roffscale {
 	SCALE_CM, /* centimeters (c) */
@@ -52,8 +51,6 @@ struct	rofftbl {
 	void		*arg; /* passed to slen and len */
 };
 
-__BEGIN_DECLS
-
 #define	SCALE_VS_INIT(p, v) \
 	do { (p)->unit = SCALE_VS; \
 	     (p)->scale = (v); } \
@@ -64,10 +61,9 @@ __BEGIN_DECLS
 	     (p)->scale = (v); } \
 	while (/* CONSTCOND */ 0)
 
-int		  a2roffsu(const char *, struct roffsu *, enum roffscale);
-void		  tblcalc(struct rofftbl *tbl,
-			const struct tbl_span *, size_t);
 
-__END_DECLS
+struct	tbl_span;
 
-#endif /*!OUT_H*/
+const char	 *a2roffsu(const char *, struct roffsu *, enum roffscale);
+void		  tblcalc(struct rofftbl *tbl,
+			const struct tbl_span *, size_t);