Move memento include from jbig2.h to jbig2_priv.h

There is no need to expose memento outside of jbig2. Thanks to
zeniko for the discussion in bug 693284 that lead to this.

2 files changed, 12 insertions, 12 deletions

diff --git a/gs/jbig2dec/jbig2.h b/gs/jbig2dec/jbig2.h
index 6622b67a3..fae08e954 100644
--- a/gs/jbig2dec/jbig2.h
+++ b/gs/jbig2dec/jbig2.h
@@ -25,18 +25,6 @@ extern "C" {
 #ifndef _JBIG2_H
 #define _JBIG2_H
 
-/* To enable Memento, either uncomment the following, or arrange to
- * predefine MEMENTO whilst building. */
-/* #define MEMENTO */
-
-/* If we are building as part of GS then make sure we use the version
- * of MEMENTO that is part of gs (in case of version skew) */
-#ifdef GSBUILD
-#include "../base/memento.h"
-#else
-#include "memento.h"
-#endif
-
 /* warning levels */
 typedef enum {
   JBIG2_SEVERITY_DEBUG,
diff --git a/gs/jbig2dec/jbig2_priv.h b/gs/jbig2dec/jbig2_priv.h
index 7aa15482f..87aa3e2da 100644
--- a/gs/jbig2dec/jbig2_priv.h
+++ b/gs/jbig2dec/jbig2_priv.h
@@ -40,6 +40,18 @@ typedef uint8_t byte;
 #define NULL ((void*)0)
 #endif
 
+/* To enable Memento, either uncomment the following, or arrange to
+ * predefine MEMENTO whilst building. */
+/* #define MEMENTO */
+
+/* If we are building as part of GS then make sure we use the version
+ * of MEMENTO that is part of gs (in case of version skew) */
+#ifdef GSBUILD
+#include "../base/memento.h"
+#else
+#include "memento.h"
+#endif
+
 typedef enum {
   JBIG2_FILE_HEADER,
   JBIG2_FILE_SEQUENTIAL_HEADER,