Moved output definitions into main.h.

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 5ab4c877d74320fc65ab14bbe34b71b077eed31c..623fa975bc71924b1a038a2308214316e5bbaae3 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.62 2009/10/09 06:54:11 kristaps Exp $ */
+/*     $Id: html.c,v 1.64 2009/10/13 10:57:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,6 +21,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -28,12 +29,15 @@
 #include "out.h"
 #include "chars.h"
 #include "html.h"
+#include "main.h"
+
+#define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 
 #define        DOCTYPE         "-//W3C//DTD HTML 4.01//EN"
 #define        DTD             "http://www.w3.org/TR/html4/strict.dtd"
 
 struct htmldata {
-       char             *name;
+       const char       *name;
        int               flags;
 #define        HTML_CLRLINE     (1 << 0)
 #define        HTML_NOSTACK     (1 << 1)
@@ -87,7 +91,8 @@ void *
 html_alloc(char *outopts)
 {
        struct html     *h;
-       char            *toks[4], *v;
+       const char      *toks[4];
+       char            *v;
 
        toks[0] = "style";
        toks[1] = "man";
@@ -106,7 +111,7 @@ html_alloc(char *outopts)
        }
 
        while (outopts && *outopts)
-               switch (getsubopt(&outopts, toks, &v)) {
+               switch (getsubopt(&outopts, UNCONST(toks), &v)) {
                case (0):
                        h->style = v;
                        break;
@@ -600,7 +605,7 @@ void
 bufcat_su(struct html *h, const char *p, const struct roffsu *su)
 {
        double           v;
-       char            *u;
+       const char      *u;
 
        v = su->scale;