summaryrefslogtreecommitdiffstats
path: root/libmdoc.h
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-06-15 09:55:43 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-06-15 09:55:43 +0000
commit6750956aa375ffc51c5434356b28b9fb570bb1dd (patch)
treec77433c815ef41932f89824dc6c30a6540461fff /libmdoc.h
parent9e7021023952321677456dcd229745ea500abdf5 (diff)
downloadmandoc-6750956aa375ffc51c5434356b28b9fb570bb1dd.tar.gz
mdoc error/warn macros replaced with real functions for GCC2 support (miod@openbsd.org).
Diffstat (limited to 'libmdoc.h')
-rw-r--r--libmdoc.h47
1 files changed, 15 insertions, 32 deletions
diff --git a/libmdoc.h b/libmdoc.h
index b9aec62b..8e5eee8d 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -55,48 +55,31 @@ struct mdoc_macro {
/* Reserved words in arguments treated as text. */
};
-#define mdoc_nwarn(mdoc, node, type, fmt, ...) \
- mdoc_vwarn((mdoc), (node)->line, \
- (node)->pos, (type), (fmt), ##__VA_ARGS__)
-
-#define mdoc_nerr(mdoc, node, fmt, ...) \
- mdoc_verr((mdoc), (node)->line, \
- (node)->pos, (fmt), ##__VA_ARGS__)
-
-#define mdoc_warn(mdoc, type, fmt, ...) \
- mdoc_vwarn((mdoc), (mdoc)->last->line, \
- (mdoc)->last->pos, (type), (fmt), ##__VA_ARGS__)
-
-#define mdoc_err(mdoc, fmt, ...) \
- mdoc_verr((mdoc), (mdoc)->last->line, \
- (mdoc)->last->pos, (fmt), ##__VA_ARGS__)
-
-#define mdoc_msg(mdoc, fmt, ...) \
- mdoc_vmsg((mdoc), (mdoc)->last->line, \
- (mdoc)->last->pos, (fmt), ##__VA_ARGS__)
-
-#define mdoc_pmsg(mdoc, line, pos, fmt, ...) \
- mdoc_vmsg((mdoc), (line), \
- (pos), (fmt), ##__VA_ARGS__)
-
-#define mdoc_pwarn(mdoc, line, pos, type, fmt, ...) \
- mdoc_vwarn((mdoc), (line), \
- (pos), (type), (fmt), ##__VA_ARGS__)
-
-#define mdoc_perr(mdoc, line, pos, fmt, ...) \
- mdoc_verr((mdoc), (line), \
- (pos), (fmt), ##__VA_ARGS__)
-
extern const struct mdoc_macro *const mdoc_macros;
__BEGIN_DECLS
+/*
+ * When GCC2 is deprecated, most of these can be reverted to #define
+ * as mdoc_vmsg using __VA_ARGS__. Until then, use real functions.
+ */
int mdoc_vwarn(struct mdoc *, int, int,
enum mdoc_warn, const char *, ...);
void mdoc_vmsg(struct mdoc *, int, int,
const char *, ...);
int mdoc_verr(struct mdoc *, int, int,
const char *, ...);
+int mdoc_nwarn(struct mdoc *, const struct mdoc_node *,
+ enum mdoc_warn, const char *, ...);
+int mdoc_nerr(struct mdoc *, const struct mdoc_node *,
+ const char *, ...);
+int mdoc_warn(struct mdoc *, enum mdoc_warn, const char *, ...);
+int mdoc_err(struct mdoc *, const char *, ...);
+void mdoc_msg(struct mdoc *, const char *, ...);
+void mdoc_pmsg(struct mdoc *, int, int, const char *, ...);
+int mdoc_pwarn(struct mdoc *, int, int,
+ enum mdoc_warn,const char *, ...);
+int mdoc_perr(struct mdoc *, int, int, const char *, ...);
int mdoc_macro(MACRO_PROT_ARGS);
int mdoc_word_alloc(struct mdoc *,
int, int, const char *);