From 8577a7cf12ccdb258b773a03471663952fd12a4c Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Fri, 13 Jan 2017 13:20:59 +0100 Subject: Fix 697476: Rename header files. Xcode has an idiotic default configuration where it gets confused by include search paths and file names in projects, so that it will load our "mupdf/fitz/math.h" instead of the system . Work around this by renaming header files that have the same base name as a system header (even though they live in a subdirectory, and should never be available directly on the compiler's include path). --- source/fitz/glyph-cache-imp.h | 2 +- source/fitz/stream-prog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/fitz') diff --git a/source/fitz/glyph-cache-imp.h b/source/fitz/glyph-cache-imp.h index e5af15ea..8e3945fd 100644 --- a/source/fitz/glyph-cache-imp.h +++ b/source/fitz/glyph-cache-imp.h @@ -3,7 +3,7 @@ #include "mupdf/fitz/system.h" #include "mupdf/fitz/context.h" -#include "mupdf/fitz/math.h" +#include "mupdf/fitz/geometry.h" #include "mupdf/fitz/font.h" #include "mupdf/fitz/path.h" #include "mupdf/fitz/pixmap.h" diff --git a/source/fitz/stream-prog.c b/source/fitz/stream-prog.c index 7aa4b339..837c33e3 100644 --- a/source/fitz/stream-prog.c +++ b/source/fitz/stream-prog.c @@ -1,5 +1,5 @@ #include "mupdf/fitz/stream.h" -#include "mupdf/fitz/string.h" +#include "mupdf/fitz/string-util.h" /* File stream - progressive reading to simulate http download */ -- cgit v1.2.3