shithub: jbig2

Info  •  Files  •  Log  •  Branches

Revert "Move memento include from jbig2.h to jbig2_priv.h"

This reverts commit 91744cfb2fe5d8b5b66d31077b4b22c6b3c905a2.

This broke the memento build of gs due to the #defining of
free/realloc. For now, we'll have to live with the include
in the public header.

--- a/jbig2.h

+++ b/jbig2.h

@@ -25,6 +25,18 @@

 #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,

--- a/jbig2_priv.h

+++ b/jbig2_priv.h

@@ -40,18 +40,6 @@

 #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,