Use C99 uint32_t, not BSD-style u_int32_t.

[mandoc.git] / libman.h

diff --git a/libman.h b/libman.h
index a0f26776416b7c8fd8314279a912deadfa0fe62b..f2ba6a125630abe718920b1cc7438233d188941d 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,6 +1,6 @@
-/*     $Id: libman.h,v 1.53 2011/07/18 07:48:14 kristaps Exp $ */
+/*     $Id: libman.h,v 1.56 2012/11/17 00:26:33 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -39,7 +39,7 @@ struct        man {
        struct roff     *roff;
 };
 
        struct roff     *roff;
 };
 

-#define        MACRO_PROT_ARGS   struct man *m, \
+#define        MACRO_PROT_ARGS   struct man *man, \

                          enum mant tok, \
                          int line, \
                          int ppos, \
                          enum mant tok, \
                          int line, \
                          int ppos, \


@@ -54,16 +54,17 @@ struct      man_macro {
 #define        MAN_FSCOPED      (1 << 2)       /* See blk_imp(). */
 #define        MAN_NSCOPED      (1 << 3)       /* See in_line_eoln(). */
 #define        MAN_NOCLOSE      (1 << 4)       /* See blk_exp(). */
 #define        MAN_FSCOPED      (1 << 2)       /* See blk_imp(). */
 #define        MAN_NSCOPED      (1 << 3)       /* See in_line_eoln(). */
 #define        MAN_NOCLOSE      (1 << 4)       /* See blk_exp(). */

+#define        MAN_BSCOPE       (1 << 5)       /* Break BLINE scope. */

 };
 
 extern const struct man_macro *const man_macros;
 
 __BEGIN_DECLS
 
 };
 
 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_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);