The st_size member of struct stat is off_t, which is signed,

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index 514db3fe279c021526d70e5cacf6829ba6356b31..cc218f4fec31a6c806d47428bd1d73b8e1c504f9 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,4 +1,4 @@
-/*     $Id: out.h,v 1.22 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: out.h,v 1.26 2014/12/01 08:05:52 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,8 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifndef OUT_H
-#define OUT_H

 
 enum   roffscale {
        SCALE_CM, /* centimeters (c) */
 
 enum   roffscale {
        SCALE_CM, /* centimeters (c) */


@@ -34,6 +32,7 @@ enum  roffscale {
 struct roffcol {
        size_t           width; /* width of cell */
        size_t           decimal; /* decimal position in cell */
 struct roffcol {
        size_t           width; /* width of cell */
        size_t           decimal; /* decimal position in cell */

+       int              flags; /* layout flags, see tbl_cell */

 };
 
 struct roffsu {
 };
 
 struct roffsu {


@@ -51,21 +50,22 @@ struct      rofftbl {
        void            *arg; /* passed to slen and len */
 };
 
        void            *arg; /* passed to slen and len */
 };
 

-__BEGIN_DECLS
-

 #define        SCALE_VS_INIT(p, v) \
        do { (p)->unit = SCALE_VS; \
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
 #define        SCALE_HS_INIT(p, v) \
 #define        SCALE_VS_INIT(p, v) \
        do { (p)->unit = SCALE_VS; \
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
 #define        SCALE_HS_INIT(p, v) \

-       do { (p)->unit = SCALE_BU; \
+       do { (p)->unit = SCALE_EN; \

             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 

+__BEGIN_DECLS
+
+struct tbl_span;
+

 int              a2roffsu(const char *, struct roffsu *, enum roffscale);
 int              a2roffsu(const char *, struct roffsu *, enum roffscale);

-void             tblcalc(struct rofftbl *tbl, const struct tbl_span *);
+void             tblcalc(struct rofftbl *tbl,
+                       const struct tbl_span *, size_t);

 
 __END_DECLS
 
 __END_DECLS

-
-#endif /*!OUT_H*/