From 44efa7e4a451793dd2357a65c92bc47719da1ad2 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Tue, 19 Aug 2014 17:11:20 +0200
Subject: Only include jmemcust.h when building our own libjpeg.

---
 source/fitz/filter-dct.c | 5 ++++-
 source/fitz/load-jpeg.c  | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source/fitz')

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 *
-- 
cgit v1.2.3