summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/mandoc/html.h6
-rw-r--r--usr.bin/mandoc/libman.h6
-rw-r--r--usr.bin/mandoc/libmandoc.h6
-rw-r--r--usr.bin/mandoc/libmdoc.h6
-rw-r--r--usr.bin/mandoc/libroff.h6
-rw-r--r--usr.bin/mandoc/main.h6
-rw-r--r--usr.bin/mandoc/man.h6
-rw-r--r--usr.bin/mandoc/mandoc.h6
-rw-r--r--usr.bin/mandoc/mandoc_aux.h6
-rw-r--r--usr.bin/mandoc/manpath.h6
-rw-r--r--usr.bin/mandoc/mansearch.h6
-rw-r--r--usr.bin/mandoc/mdoc.h6
-rw-r--r--usr.bin/mandoc/out.h7
-rw-r--r--usr.bin/mandoc/term.h7
14 files changed, 14 insertions, 72 deletions
diff --git a/usr.bin/mandoc/html.h b/usr.bin/mandoc/html.h
index 3c55a64bf30..092e05cc31c 100644
--- a/usr.bin/mandoc/html.h
+++ b/usr.bin/mandoc/html.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: html.h,v 1.29 2014/10/28 17:35:42 schwarze Exp $ */
+/* $OpenBSD: html.h,v 1.30 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -14,8 +14,6 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef HTML_H
-#define HTML_H
__BEGIN_DECLS
@@ -173,5 +171,3 @@ void buffmt_includes(struct html *, const char *);
int html_strlen(const char *);
__END_DECLS
-
-#endif /*!HTML_H*/
diff --git a/usr.bin/mandoc/libman.h b/usr.bin/mandoc/libman.h
index 9d70a3c7505..6d9ed915ed7 100644
--- a/usr.bin/mandoc/libman.h
+++ b/usr.bin/mandoc/libman.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: libman.h,v 1.39 2014/11/03 23:17:21 schwarze Exp $ */
+/* $OpenBSD: libman.h,v 1.40 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 LIBMAN_H
-#define LIBMAN_H
enum man_next {
MAN_NEXT_SIBLING = 0,
@@ -76,5 +74,3 @@ int man_valid_post(struct man *);
int man_unscope(struct man *, const struct man_node *);
__END_DECLS
-
-#endif /*!LIBMAN_H*/
diff --git a/usr.bin/mandoc/libmandoc.h b/usr.bin/mandoc/libmandoc.h
index 3067ffe3017..7fc3653e363 100644
--- a/usr.bin/mandoc/libmandoc.h
+++ b/usr.bin/mandoc/libmandoc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: libmandoc.h,v 1.34 2014/11/01 06:02:43 schwarze Exp $ */
+/* $OpenBSD: libmandoc.h,v 1.35 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 LIBMANDOC_H
-#define LIBMANDOC_H
enum rofferr {
ROFF_CONT, /* continue processing line */
@@ -88,5 +86,3 @@ const struct tbl_span *roff_span(const struct roff *);
const struct eqn *roff_eqn(const struct roff *);
__END_DECLS
-
-#endif /*!LIBMANDOC_H*/
diff --git a/usr.bin/mandoc/libmdoc.h b/usr.bin/mandoc/libmdoc.h
index b95bc28c8b9..469f520e098 100644
--- a/usr.bin/mandoc/libmdoc.h
+++ b/usr.bin/mandoc/libmdoc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: libmdoc.h,v 1.59 2014/11/17 06:44:35 schwarze Exp $ */
+/* $OpenBSD: libmdoc.h,v 1.60 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 LIBMDOC_H
-#define LIBMDOC_H
enum mdoc_next {
MDOC_NEXT_SIBLING = 0,
@@ -140,5 +138,3 @@ int mdoc_macroend(struct mdoc *);
enum mdelim mdoc_isdelim(const char *);
__END_DECLS
-
-#endif /*!LIBMDOC_H*/
diff --git a/usr.bin/mandoc/libroff.h b/usr.bin/mandoc/libroff.h
index 6e2c444b124..94702571b09 100644
--- a/usr.bin/mandoc/libroff.h
+++ b/usr.bin/mandoc/libroff.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: libroff.h,v 1.9 2014/10/25 14:32:07 schwarze Exp $ */
+/* $OpenBSD: libroff.h,v 1.10 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 LIBROFF_H
-#define LIBROFF_H
__BEGIN_DECLS
@@ -84,5 +82,3 @@ enum rofferr eqn_read(struct eqn_node **, int,
const char *, int, int *);
__END_DECLS
-
-#endif /*LIBROFF_H*/
diff --git a/usr.bin/mandoc/main.h b/usr.bin/mandoc/main.h
index 8733e43e401..d22e7a3112a 100644
--- a/usr.bin/mandoc/main.h
+++ b/usr.bin/mandoc/main.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.h,v 1.12 2014/10/28 17:35:42 schwarze Exp $ */
+/* $OpenBSD: main.h,v 1.13 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -14,8 +14,6 @@
* 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
__BEGIN_DECLS
@@ -56,5 +54,3 @@ void terminal_mdoc(void *, const struct mdoc *);
void terminal_man(void *, const struct man *);
__END_DECLS
-
-#endif /*!MAIN_H*/
diff --git a/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h
index e21d4cfced8..bab51cc9464 100644
--- a/usr.bin/mandoc/man.h
+++ b/usr.bin/mandoc/man.h
@@ -1,4 +1,4 @@
-/* $Id: man.h,v 1.44 2014/06/20 22:58:41 schwarze Exp $ */
+/* $Id: man.h,v 1.45 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 MAN_H
-#define MAN_H
enum mant {
MAN_br = 0,
@@ -117,5 +115,3 @@ const struct mparse *man_mparse(const struct man *);
void man_deroff(char **, const struct man_node *);
__END_DECLS
-
-#endif /*!MAN_H*/
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h
index 5847732e443..483a36392e1 100644
--- a/usr.bin/mandoc/mandoc.h
+++ b/usr.bin/mandoc/mandoc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mandoc.h,v 1.112 2014/11/26 21:40:11 schwarze Exp $ */
+/* $OpenBSD: mandoc.h,v 1.113 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 MANDOC_H
-#define MANDOC_H
#define ASCII_NBRSP 31 /* non-breaking space */
#define ASCII_HYPH 30 /* breakable hyphen */
@@ -447,5 +445,3 @@ const char *mparse_strlevel(enum mandoclevel);
enum mandoclevel mparse_wait(struct mparse *);
__END_DECLS
-
-#endif /*!MANDOC_H*/
diff --git a/usr.bin/mandoc/mandoc_aux.h b/usr.bin/mandoc/mandoc_aux.h
index 3ae1d94a673..28e4f5e3b41 100644
--- a/usr.bin/mandoc/mandoc_aux.h
+++ b/usr.bin/mandoc/mandoc_aux.h
@@ -1,4 +1,4 @@
-/* $Id: mandoc_aux.h,v 1.3 2014/04/23 21:06:33 schwarze Exp $ */
+/* $Id: mandoc_aux.h,v 1.4 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 MANDOC_AUX_H
-#define MANDOC_AUX_H
__BEGIN_DECLS
@@ -29,5 +27,3 @@ char *mandoc_strdup(const char *);
char *mandoc_strndup(const char *, size_t);
__END_DECLS
-
-#endif /*!MANDOC_AUX_H*/
diff --git a/usr.bin/mandoc/manpath.h b/usr.bin/mandoc/manpath.h
index c2d3bb14bea..9ae68d36412 100644
--- a/usr.bin/mandoc/manpath.h
+++ b/usr.bin/mandoc/manpath.h
@@ -1,4 +1,4 @@
-/* $Id: manpath.h,v 1.4 2013/05/29 23:15:11 schwarze Exp $ */
+/* $Id: manpath.h,v 1.5 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -15,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 MANPATH_H
-#define MANPATH_H
/*
* Unsorted list of unique, absolute paths to be searched for manual
@@ -34,5 +32,3 @@ void manpath_parse(struct manpaths *, const char *, char *, char *);
void manpath_free(struct manpaths *);
__END_DECLS
-
-#endif /*!MANPATH_H*/
diff --git a/usr.bin/mandoc/mansearch.h b/usr.bin/mandoc/mansearch.h
index a62e1a9c362..97c8465faf6 100644
--- a/usr.bin/mandoc/mansearch.h
+++ b/usr.bin/mandoc/mansearch.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mansearch.h,v 1.17 2014/11/27 01:57:42 schwarze Exp $ */
+/* $OpenBSD: mansearch.h,v 1.18 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,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 MANSEARCH_H
-#define MANSEARCH_H
#define MANDOC_DB "mandoc.db"
@@ -109,5 +107,3 @@ int mansearch(const struct mansearch *cfg, /* options */
void mansearch_free(struct manpage *, size_t);
__END_DECLS
-
-#endif /* MANSEARCH_H */
diff --git a/usr.bin/mandoc/mdoc.h b/usr.bin/mandoc/mdoc.h
index 6d5bff6c10c..9cbbcd5c390 100644
--- a/usr.bin/mandoc/mdoc.h
+++ b/usr.bin/mandoc/mdoc.h
@@ -1,4 +1,4 @@
-/* $Id: mdoc.h,v 1.55 2014/08/08 15:03:24 schwarze Exp $ */
+/* $Id: mdoc.h,v 1.56 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -14,8 +14,6 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef MDOC_H
-#define MDOC_H
enum mdoct {
MDOC_Ap = 0,
@@ -395,5 +393,3 @@ const struct mdoc_meta *mdoc_meta(const struct mdoc *);
void mdoc_deroff(char **, const struct mdoc_node *);
__END_DECLS
-
-#endif /*!MDOC_H*/
diff --git a/usr.bin/mandoc/out.h b/usr.bin/mandoc/out.h
index 57dd409970a..1ee4041bc48 100644
--- a/usr.bin/mandoc/out.h
+++ b/usr.bin/mandoc/out.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: out.h,v 1.15 2014/10/14 02:16:02 schwarze Exp $ */
+/* $OpenBSD: out.h,v 1.16 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -14,9 +14,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) */
SCALE_IN, /* inches (i) */
@@ -69,5 +66,3 @@ void tblcalc(struct rofftbl *tbl,
const struct tbl_span *, size_t);
__END_DECLS
-
-#endif /*!OUT_H*/
diff --git a/usr.bin/mandoc/term.h b/usr.bin/mandoc/term.h
index 39e4388e524..71b9c3bca96 100644
--- a/usr.bin/mandoc/term.h
+++ b/usr.bin/mandoc/term.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: term.h,v 1.49 2014/10/28 17:35:42 schwarze Exp $ */
+/* $OpenBSD: term.h,v 1.50 2014/11/27 14:31:29 deraadt Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +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 TERM_H
-#define TERM_H
-
__BEGIN_DECLS
struct termp;
@@ -134,5 +131,3 @@ void term_fontrepl(struct termp *, enum termfont);
void term_fontlast(struct termp *);
__END_DECLS
-
-#endif /*!TERM_H*/
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.