aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2018-12-13 07:30:21 +0000
committerIngo Schwarze <schwarze@openbsd.org>2018-12-13 07:30:21 +0000
commitef2d1ed7915b0e62315dcecce1bc447b55254b7c (patch)
tree7ff782dbcc2d004cd932bf11a20941654ab3e360
parent48b62a55d6c75588b6450faa191c7f9166de0cbd (diff)
downloadmandoc-ef2d1ed7915b0e62315dcecce1bc447b55254b7c.tar.gz
mandoc-ef2d1ed7915b0e62315dcecce1bc447b55254b7c.tar.zst
mandoc-ef2d1ed7915b0e62315dcecce1bc447b55254b7c.zip
libmdoc.h no longer needs mdoc.h
-rw-r--r--att.c3
-rw-r--r--mandoc_headers.322
2 files changed, 10 insertions, 15 deletions
diff --git a/att.c b/att.c
index dd7f2a0d..5ac45673 100644
--- a/att.c
+++ b/att.c
@@ -1,4 +1,4 @@
-/* $Id: att.c,v 1.16 2017/06/24 14:38:32 schwarze Exp $ */
+/* $Id: att.c,v 1.17 2018/12/13 07:30:21 schwarze Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -21,7 +21,6 @@
#include "mandoc.h"
#include "roff.h"
-#include "mdoc.h"
#include "libmdoc.h"
#define LINE(x, y) \
diff --git a/mandoc_headers.3 b/mandoc_headers.3
index 4c8ce5c2..f4d15885 100644
--- a/mandoc_headers.3
+++ b/mandoc_headers.3
@@ -171,10 +171,6 @@ Common data types for all syntax trees and related functions;
can be used everywhere.
.Pp
Requires
-.Qq Pa mandoc_ohash.h
-for
-.Vt struct ohash
-and
.Qq Pa mandoc.h
for
.Vt enum mandoc_os .
@@ -197,6 +193,10 @@ and
.Fn roff_validate .
.Pp
Uses pointers to the types
+.Vt struct ohash
+from
+.Pa mandoc_ohash.h
+and
.Vt struct mdoc_arg
and
.Vt union mdoc_data
@@ -341,11 +341,7 @@ Requires
for
.Vt enum roff_tok
and
-.Qq Pa mdoc.h
-for
-.Vt enum mdoc_*
-and
-.Vt struct mdoc_* .
+.Vt enum roff_sec .
.Pp
Provides
.Vt enum margserr ,
@@ -355,16 +351,16 @@ and many functions internal to the
.Xr mdoc 7
parser.
.Pp
-Uses the opaque type
-.Vt struct mparse
-from
-.Pa read.c .
Uses the types
.Vt struct roff_man
and
.Vt struct roff_node
from
.Pa roff.h
+and
+.Vt struct mdoc_arg
+from
+.Pa mdoc.h
as opaque types for function prototypes.
.Pp
When this header is included, the same file should not include