diff options
| -rw-r--r-- | fitz/fitz_base.h | 6 | ||||
| -rw-r--r-- | fitz/fitz_stream.h | 4 | ||||
| -rw-r--r-- | mupdf/Jamfile | 2 | ||||
| -rw-r--r-- | mupdf/cmapdump.c | 8 |
4 files changed, 18 insertions, 2 deletions
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h index 18326eea..78efea49 100644 --- a/fitz/fitz_base.h +++ b/fitz/fitz_base.h @@ -2,6 +2,9 @@ * Include the basic standard libc headers. */ +#ifndef _FITZ_BASE_H_ +#define _FITZ_BASE_H_ + #include <stdio.h> #include <stdlib.h> #include <stddef.h> @@ -319,3 +322,6 @@ fz_error fz_newscaledpixmap(fz_pixmap **dstp, int w, int h, int n, int xdenom, i fz_error fz_scalepixmaptile(fz_pixmap *dstp, int xoffs, int yoffs, fz_pixmap *tile, int xdenom, int ydenom); +#endif + + diff --git a/fitz/fitz_stream.h b/fitz/fitz_stream.h index df3dec29..f5d659e6 100644 --- a/fitz/fitz_stream.h +++ b/fitz/fitz_stream.h @@ -4,6 +4,9 @@ * Used by the filter library and the mupdf parser. */ +#ifndef _FITZ_STREAM_H_ +#define _FITZ_STREAM_H_ + typedef struct pdf_xref_s pdf_xref; /* this file is about to be merged with mupdf */ typedef struct fz_obj_s fz_obj; @@ -409,3 +412,4 @@ static inline int fz_peekbyte(fz_stream *stm) #endif +#endif diff --git a/mupdf/Jamfile b/mupdf/Jamfile index 28d91dca..a90ac003 100644 --- a/mupdf/Jamfile +++ b/mupdf/Jamfile @@ -5,9 +5,7 @@ SubDir TOP mupdf ; Main fontdump : fontdump.c ; - Main cmapdump : cmapdump.c ; -LinkLibraries cmapdump : libfitz ; Library libmupdf : diff --git a/mupdf/cmapdump.c b/mupdf/cmapdump.c index e3521231..010a8f42 100644 --- a/mupdf/cmapdump.c +++ b/mupdf/cmapdump.c @@ -6,6 +6,14 @@ #include "fitz.h" #include "mupdf.h" +#include "../fitz/base_error.c" +#include "../fitz/base_memory.c" +#include "../fitz/base_string.c" +#include "../fitz/stm_buffer.c" +#include "../fitz/stm_filter.c" +#include "../fitz/stm_open.c" +#include "../fitz/stm_read.c" + #include "../mupdf/pdf_lex.c" #include "../mupdf/pdf_cmap.c" #include "../mupdf/pdf_cmap_parse.c" |