diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | source/html/css-apply.c | 3 | ||||
| -rw-r--r-- | source/html/css-parse.c | 3 | ||||
| -rw-r--r-- | source/html/epub-doc.c | 3 | ||||
| -rw-r--r-- | source/html/html-doc.c | 3 | ||||
| -rw-r--r-- | source/html/html-font.c | 3 | ||||
| -rw-r--r-- | source/html/html-imp.h (renamed from include/mupdf/html.h) | 6 | ||||
| -rw-r--r-- | source/html/html-layout.c | 2 | ||||
| -rw-r--r-- | source/svg/svg-imp.h | 4 | ||||
| -rw-r--r-- | source/xps/xps-imp.h | 4 |
10 files changed, 17 insertions, 15 deletions
@@ -122,7 +122,6 @@ $(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR) FITZ_HDR := include/mupdf/fitz.h $(wildcard include/mupdf/fitz/*.h) PDF_HDR := include/mupdf/pdf.h $(wildcard include/mupdf/pdf/*.h) SVG_HDR := include/mupdf/svg.h -HTML_HDR := include/mupdf/html.h THREAD_HDR := include/mupdf/helpers/mu-threads.h FITZ_SRC := $(wildcard source/fitz/*.c) diff --git a/source/html/css-apply.c b/source/html/css-apply.c index f3e28ddd..e1ad46ff 100644 --- a/source/html/css-apply.c +++ b/source/html/css-apply.c @@ -1,4 +1,5 @@ -#include "mupdf/html.h" +#include "mupdf/fitz.h" +#include "html-imp.h" static const char *inherit_list[] = { "color", diff --git a/source/html/css-parse.c b/source/html/css-parse.c index b5d436e8..d92e3d7b 100644 --- a/source/html/css-parse.c +++ b/source/html/css-parse.c @@ -1,4 +1,5 @@ -#include "mupdf/html.h" +#include "mupdf/fitz.h" +#include "html-imp.h" struct lexbuf { diff --git a/source/html/epub-doc.c b/source/html/epub-doc.c index c43ef8b1..495b397f 100644 --- a/source/html/epub-doc.c +++ b/source/html/epub-doc.c @@ -1,4 +1,5 @@ -#include "mupdf/html.h" +#include "mupdf/fitz.h" +#include "html-imp.h" enum { T, R, B, L }; diff --git a/source/html/html-doc.c b/source/html/html-doc.c index 1cf3dca5..825e3958 100644 --- a/source/html/html-doc.c +++ b/source/html/html-doc.c @@ -1,4 +1,5 @@ -#include "mupdf/html.h" +#include "mupdf/fitz.h" +#include "html-imp.h" enum { T, R, B, L }; diff --git a/source/html/html-font.c b/source/html/html-font.c index 48c04b73..640c8565 100644 --- a/source/html/html-font.c +++ b/source/html/html-font.c @@ -1,4 +1,5 @@ -#include "mupdf/html.h" +#include "mupdf/fitz.h" +#include "html-imp.h" static fz_font * fz_load_html_default_font(fz_context *ctx, fz_html_font_set *set, const char *family, int is_bold, int is_italic) diff --git a/include/mupdf/html.h b/source/html/html-imp.h index 1bd72197..1cf2c6eb 100644 --- a/include/mupdf/html.h +++ b/source/html/html-imp.h @@ -1,7 +1,5 @@ -#ifndef MUPDF_HTML_H -#define MUPDF_HTML_H - -#include "mupdf/fitz.h" +#ifndef SOURCE_HTML_IMP_H +#define SOURCE_HTML_IMP_H typedef struct fz_html_font_face_s fz_html_font_face; typedef struct fz_html_font_set_s fz_html_font_set; diff --git a/source/html/html-layout.c b/source/html/html-layout.c index 15d52c1b..ac64a890 100644 --- a/source/html/html-layout.c +++ b/source/html/html-layout.c @@ -1,7 +1,7 @@ #include "mupdf/fitz.h" #include "mupdf/ucdn.h" #include "mupdf/svg.h" -#include "mupdf/html.h" +#include "html-imp.h" #include "hb.h" #include "hb-ft.h" diff --git a/source/svg/svg-imp.h b/source/svg/svg-imp.h index 419e66b9..45566074 100644 --- a/source/svg/svg-imp.h +++ b/source/svg/svg-imp.h @@ -1,5 +1,5 @@ -#ifndef MUPDF_SVG_IMP_H -#define MUPDF_SVG_IMP_H +#ifndef SOURCE_SVG_IMP_H +#define SOURCE_SVG_IMP_H typedef struct svg_document_s svg_document; diff --git a/source/xps/xps-imp.h b/source/xps/xps-imp.h index d783c5c0..f86f16f1 100644 --- a/source/xps/xps-imp.h +++ b/source/xps/xps-imp.h @@ -1,5 +1,5 @@ -#ifndef MUPDF_XPS_IMP_H -#define MUPDF_XPS_IMP_H +#ifndef SOURCE_XPS_IMP_H +#define SOURCE_XPS_IMP_H typedef struct xps_document_s xps_document; typedef struct xps_page_s xps_page; |