Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / main.h

diff --git a/main.h b/main.h
index 79dcf489ae65f4f3264b7aafe6f03af48f96468e..147c22f594643d0b1d2188264810634a22d8f06a 100644 (file)
--- a/main.h
+++ b/main.h
@@ -1,4 +1,4 @@
-/*     $Id: main.h,v 1.15 2011/10/06 22:29:12 kristaps Exp $ */
+/*     $Id: main.h,v 1.19 2014/12/01 08:05:52 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,26 +14,23 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef        MAIN_H
-#define        MAIN_H
+
+#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))

 
 __BEGIN_DECLS
 
 
 __BEGIN_DECLS
 

+struct mchars;

 struct mdoc;
 struct man;
 
 struct mdoc;
 struct man;
 

-#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
-
-
-/* 
+/*

  * Definitions for main.c-visible output device functions, e.g., -Thtml
  * and -Tascii.  Note that ascii_alloc() is named as such in
  * anticipation of latin1_alloc() and so on, all of which map into the
  * terminal output routines with different character settings.
  */
 
  * Definitions for main.c-visible output device functions, e.g., -Thtml
  * and -Tascii.  Note that ascii_alloc() is named as such in
  * anticipation of latin1_alloc() and so on, all of which map into the
  * terminal output routines with different character settings.
  */
 

-void            *html_alloc(char *);
-void            *xhtml_alloc(char *);
+void            *html_alloc(const struct mchars *, char *);

 void             html_mdoc(void *, const struct mdoc *);
 void             html_man(void *, const struct man *);
 void             html_free(void *);
 void             html_mdoc(void *, const struct mdoc *);
 void             html_man(void *, const struct man *);
 void             html_free(void *);


@@ -44,18 +41,16 @@ void                  tree_man(void *, const struct man *);
 void             man_mdoc(void *, const struct mdoc *);
 void             man_man(void *, const struct man *);
 
 void             man_mdoc(void *, const struct mdoc *);
 void             man_man(void *, const struct man *);
 

-void            *locale_alloc(char *);
-void            *utf8_alloc(char *);
-void            *ascii_alloc(char *);
+void            *locale_alloc(const struct mchars *, char *);
+void            *utf8_alloc(const struct mchars *, char *);
+void            *ascii_alloc(const struct mchars *, char *);

 void             ascii_free(void *);
 
 void             ascii_free(void *);
 

-void            *pdf_alloc(char *);
-void            *ps_alloc(char *);
+void            *pdf_alloc(const struct mchars *, char *);
+void            *ps_alloc(const struct mchars *, char *);

 void             pspdf_free(void *);
 
 void             terminal_mdoc(void *, const struct mdoc *);
 void             terminal_man(void *, const struct man *);
 
 __END_DECLS
 void             pspdf_free(void *);
 
 void             terminal_mdoc(void *, const struct mdoc *);
 void             terminal_man(void *, const struct man *);
 
 __END_DECLS

-
-#endif /*!MAIN_H*/