diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2015-10-18 14:22:06 +0300 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2015-11-03 15:48:48 -0500 |
| commit | 260e9a87725c090ba5835b1f9f0b62fa2f96036f (patch) | |
| tree | 46ce875eadee4e0fa3586128cacfea38e5b15569 /usr/src/cmd/mandoc/main.h | |
| parent | 1058dba45ec5d6876a5bbb0b9174347e13e5748d (diff) | |
| download | illumos-joyent-260e9a87725c090ba5835b1f9f0b62fa2f96036f.tar.gz | |
6356 Update mdocml to 1.13.3
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/mandoc/main.h')
| -rw-r--r-- | usr/src/cmd/mandoc/main.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/usr/src/cmd/mandoc/main.h b/usr/src/cmd/mandoc/main.h index 79dcf489ae..9b04a7816a 100644 --- a/usr/src/cmd/mandoc/main.h +++ b/usr/src/cmd/mandoc/main.h @@ -1,6 +1,7 @@ -/* $Id: main.h,v 1.15 2011/10/06 22:29:12 kristaps Exp $ */ +/* $Id: main.h,v 1.20 2014/12/31 16:52:40 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> + * Copyright (c) 2014 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,26 +15,23 @@ * 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 +struct mchars; 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. */ -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 *); @@ -44,18 +42,17 @@ void tree_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_sepline(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 - -#endif /*!MAIN_H*/ |