5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD

@@ -1,6 +1,6 @@
-/*      $Id: libman.h,v 1.55 2011/11/07 01:24:40 schwarze Exp $ */
+/*      $Id: libman.h,v 1.56 2012/11/17 00:26:33 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

@@ -37,11 +37,11 @@
         struct man_node *first; /* the first parsed node */
         struct man_meta  meta; /* document meta-data */
         struct roff     *roff;
 };
 
-#define MACRO_PROT_ARGS   struct man *m, \
+#define MACRO_PROT_ARGS   struct man *man, \
                           enum mant tok, \
                           int line, \
                           int ppos, \
                           int *pos, \
                           char *buf

@@ -59,14 +59,14 @@
 
 extern  const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
-#define           man_pmsg(m, l, p, t) \
-                  mandoc_msg((t), (m)->parse, (l), (p), NULL)
-#define           man_nmsg(m, n, t) \
-                  mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
+#define           man_pmsg(man, l, p, t) \
+                  mandoc_msg((t), (man)->parse, (l), (p), NULL)
+#define           man_nmsg(man, n, t) \
+                  mandoc_msg((t), (man)->parse, (n)->line, (n)->pos, NULL)
 int               man_word_alloc(struct man *, int, int, const char *);
 int               man_block_alloc(struct man *, int, int, enum mant);
 int               man_head_alloc(struct man *, int, int, enum mant);
 int               man_tail_alloc(struct man *, int, int, enum mant);
 int               man_body_alloc(struct man *, int, int, enum mant);