disable some tests that expose wcwidth(3) differences among systems

[mandoc.git] / libmandoc.h

diff --git a/libmandoc.h b/libmandoc.h
index c16cf4d35f1662541982f4f6ef2b9e25c1653051..96e726cbce74fca8c20ff00478df00fa0a1f7d99 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmandoc.h,v 1.57 2015/04/18 17:01:58 schwarze Exp $ */
+/*     $Id: libmandoc.h,v 1.64 2016/07/19 13:36:13 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,10 +32,8 @@ struct       buf {
        size_t   sz;
 };
 
-__BEGIN_DECLS
 
 struct mparse;
-struct mchars;
 struct tbl_span;
 struct eqn;
 struct roff;
@@ -43,44 +41,34 @@ struct      roff_man;
 
 void            mandoc_msg(enum mandocerr, struct mparse *,
                        int, int, const char *);
-#if __GNUC__ - 0 >= 4
-__attribute__((__format__ (__printf__, 5, 6)))
-#endif
 void            mandoc_vmsg(enum mandocerr, struct mparse *,
-                       int, int, const char *, ...);
+                       int, int, const char *, ...)
+                       __attribute__((__format__ (printf, 5, 6)));
 char           *mandoc_getarg(struct mparse *, char **, int, int *);
 char           *mandoc_normdate(struct mparse *, char *, int, int);
 int             mandoc_eos(const char *, size_t);
 int             mandoc_strntoi(const char *, size_t, int);
 const char     *mandoc_a2msec(const char*);
 
-void            mdoc_free(struct roff_man *);
-struct roff_man        *mdoc_alloc(struct roff *, struct mparse *,
-                       const char *, int);
-void            mdoc_reset(struct roff_man *);
 void            mdoc_hash_init(void);
 int             mdoc_parseln(struct roff_man *, int, char *, int);
 void            mdoc_endparse(struct roff_man *);
-void            mdoc_addspan(struct roff_man *, const struct tbl_span *);
-void            mdoc_addeqn(struct roff_man *, const struct eqn *);
 
-void            man_free(struct roff_man *);
-struct roff_man        *man_alloc(struct roff *, struct mparse *,
-                       const char *, int);
-void            man_reset(struct roff_man *);
 void            man_hash_init(void);
 int             man_parseln(struct roff_man *, int, char *, int);
 void            man_endparse(struct roff_man *);
-void            man_addspan(struct roff_man *, const struct tbl_span *);
-void            man_addeqn(struct roff_man *, const struct eqn *);
 
 int             preconv_cue(const struct buf *, size_t);
 int             preconv_encode(struct buf *, size_t *,
                        struct buf *, size_t *, int *);
 
 void            roff_free(struct roff *);
-struct roff    *roff_alloc(struct mparse *, const struct mchars *, int);
+struct roff    *roff_alloc(struct mparse *, int);
 void            roff_reset(struct roff *);
+void            roff_man_free(struct roff_man *);
+struct roff_man        *roff_man_alloc(struct roff *, struct mparse *,
+                       const char *, int);
+void            roff_man_reset(struct roff_man *);
 enum rofferr    roff_parseln(struct roff *, int, struct buf *, int *);
 void            roff_endparse(struct roff *);
 void            roff_setreg(struct roff *, const char *, int, char sign);
@@ -92,5 +80,3 @@ int            roff_getformat(const struct roff *);
 
 const struct tbl_span  *roff_span(const struct roff *);
 const struct eqn       *roff_eqn(const struct roff *);
-
-__END_DECLS