Merge master and pg_android branches

Bring up to date with current APIs, including text device changes.

1 files changed, 7 insertions, 3 deletions

diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c
index 12d6f2af..53247339 100644
--- a/scripts/cmapdump.c
+++ b/scripts/cmapdump.c
@@ -6,8 +6,8 @@
 /* We never want to build memento versions of the cmapdump util */
 #undef MEMENTO
 
-#include "fitz.h"
-#include "mupdf.h"
+#include "fitz-internal.h"
+#include "mupdf-internal.h"
 
 #include "../fitz/base_context.c"
 #include "../fitz/base_error.c"
@@ -181,6 +181,10 @@ void fz_free_aa_context(fz_context *ctx)
 {
 }
 
+void fz_copy_aa_context(fz_context *dst, fz_context *src)
+{
+}
+
 void *fz_keep_storable(fz_context *ctx, fz_storable *s)
 {
 	return s;
@@ -198,7 +202,7 @@ void fz_drop_store_context(fz_context *ctx)
 {
 }
 
-fz_store *fz_store_keep(fz_context *ctx)
+fz_store *fz_keep_store_context(fz_context *ctx)
 {
 	return NULL;
 }