diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2014-08-19 17:11:20 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2014-08-19 17:11:20 +0200 |
| commit | 44efa7e4a451793dd2357a65c92bc47719da1ad2 (patch) | |
| tree | 434eab5fb20908b8044598b421ef6ad34b340c4a /source/fitz | |
| parent | 5462659976b618a43493a09a3e5cfe043816ae94 (diff) | |
| download | mupdf-44efa7e4a451793dd2357a65c92bc47719da1ad2.tar.xz | |
Only include jmemcust.h when building our own libjpeg.
Diffstat (limited to 'source/fitz')
| -rw-r--r-- | source/fitz/filter-dct.c | 5 | ||||
| -rw-r--r-- | source/fitz/load-jpeg.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/fitz/filter-dct.c b/source/fitz/filter-dct.c index b72c7ce6..2929fb05 100644 --- a/source/fitz/filter-dct.c +++ b/source/fitz/filter-dct.c @@ -1,9 +1,12 @@ #include "mupdf/fitz.h" #include <jpeglib.h> +#include <setjmp.h> + +#ifndef SHARE_JPEG typedef void * backing_store_ptr; #include "jmemcust.h" -#include <setjmp.h> +#endif typedef struct fz_dctd_s fz_dctd; diff --git a/source/fitz/load-jpeg.c b/source/fitz/load-jpeg.c index 15e6e713..96c82ebd 100644 --- a/source/fitz/load-jpeg.c +++ b/source/fitz/load-jpeg.c @@ -1,8 +1,6 @@ #include "mupdf/fitz.h" #include <jpeglib.h> -typedef void * backing_store_ptr; -#include "jmemcust.h" #ifdef SHARE_JPEG @@ -13,6 +11,9 @@ typedef void * backing_store_ptr; #else /* SHARE_JPEG */ +typedef void * backing_store_ptr; +#include "jmemcust.h" + #define JZ_CTX_FROM_CINFO(c) (fz_context *)(GET_CUST_MEM_DATA(c)->priv) static void * |