diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2017-01-13 13:20:59 +0100 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2017-01-17 20:14:38 +0100 |
commit | 8577a7cf12ccdb258b773a03471663952fd12a4c (patch) | |
tree | dcc5d8e6a38c9dcc79a32dafbe4bc78bbe87b8eb /source | |
parent | eee26d32f6f9eb4f1e815e3b43c959666edb6ed1 (diff) | |
download | mupdf-8577a7cf12ccdb258b773a03471663952fd12a4c.tar.xz |
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 <math.h>.
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).
Diffstat (limited to 'source')
-rw-r--r-- | source/fitz/glyph-cache-imp.h | 2 | ||||
-rw-r--r-- | source/fitz/stream-prog.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 */ |