Revert part of the previous diff to fix a regression (another endless loop)

[mandoc.git] / main.h

diff --git a/main.h b/main.h
index c3e09be64c44c4930f3573c636496b367c2aecd9..19a630cde8b61a0a215568bbfb86fb76823e7bc1 100644 (file)
--- a/main.h
+++ b/main.h
@@ -1,7 +1,7 @@
-/*     $Id: main.h,v 1.28 2018/08/23 19:33:27 schwarze Exp $ */
+/*     $Id: main.h,v 1.30 2019/03/03 13:02:11 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2019 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
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-struct roff_man;
+struct roff_meta;
 struct manoutput;
 
 /*
@@ -27,14 +27,15 @@ struct      manoutput;
  */
 
 void            *html_alloc(const struct manoutput *);
-void             html_mdoc(void *, const struct roff_man *);
-void             html_man(void *, const struct roff_man *);
+void             html_mdoc(void *, const struct roff_meta *);
+void             html_man(void *, const struct roff_meta *);
+void             html_reset(void *);
 void             html_free(void *);
 
-void             tree_mdoc(void *, const struct roff_man *);
-void             tree_man(void *, const struct roff_man *);
+void             tree_mdoc(void *, const struct roff_meta *);
+void             tree_man(void *, const struct roff_meta *);
 
-void             man_mdoc(void *, const struct roff_man *);
+void             man_mdoc(void *, const struct roff_meta *);
 
 void            *locale_alloc(const struct manoutput *);
 void            *utf8_alloc(const struct manoutput *);
@@ -45,8 +46,8 @@ void           *pdf_alloc(const struct manoutput *);
 void            *ps_alloc(const struct manoutput *);
 void             pspdf_free(void *);
 
-void             terminal_mdoc(void *, const struct roff_man *);
-void             terminal_man(void *, const struct roff_man *);
+void             terminal_mdoc(void *, const struct roff_meta *);
+void             terminal_man(void *, const struct roff_meta *);
 void             terminal_sepline(void *);
 
-void             markdown_mdoc(void *, const struct roff_man *);
+void             markdown_mdoc(void *, const struct roff_meta *);