Make 64-bit integers available everywhere in fitz

2 files changed, 15 insertions, 16 deletions

diff --git a/fitz/filt_jbig2d.c b/fitz/filt_jbig2d.c
index 415534c0..d7f09cee 100644
--- a/fitz/filt_jbig2d.c
+++ b/fitz/filt_jbig2d.c
@@ -1,20 +1,5 @@
 #include "fitz-internal.h"
 
-#ifdef _WIN32 /* Microsoft Visual C++ */
-
-typedef signed char int8_t;
-typedef short int int16_t;
-typedef int int32_t;
-typedef __int64 int64_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short int uint16_t;
-typedef unsigned int uint32_t;
-
-#else
-#include <inttypes.h>
-#endif
-
 #include <jbig2.h>
 
 typedef struct fz_jbig2d_s fz_jbig2d;
diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h
index 20e9e8b0..3b35dfaa 100644
--- a/fitz/fitz-internal.h
+++ b/fitz/fitz-internal.h
@@ -3,13 +3,27 @@
 
 #include "fitz.h"
 
+#ifdef _WIN32 /* Microsoft Visual C++ */
+
+typedef signed char int8_t;
+typedef short int int16_t;
+typedef int int32_t;
+typedef __int64 int64_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short int uint16_t;
+typedef unsigned int uint32_t;
+
+#else
+#include <inttypes.h>
+#endif
+
 struct fz_warn_context_s
 {
 	char message[256];
 	int count;
 };
 
-
 fz_context *fz_clone_context_internal(fz_context *ctx);
 
 void fz_new_aa_context(fz_context *ctx);