2 files changed, 20 insertions, 4 deletions

diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index c1cae4c..748ffef 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -11,6 +11,9 @@ AC_PROG_CXX
 AC_CHECK_HEADERS([lzma.h])
 AC_CHECK_LIB(lzma, lzma_easy_buffer_encode)
 AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(unsigned int)
+AC_CHECK_SIZEOF(unsigned long)
+AC_CHECK_SIZEOF(unsigned long long)
 #AM_PATH_PYTHON(,, [:])
 #AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 #AX_PYTHON_DEVEL()
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index f72cdc9..9d6427a 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -153,16 +153,29 @@ typedef uint32_t usize_t;
 #define _FILE_OFFSET_BITS 64
 #endif
 
-typedef uint64_t xoff_t;
-#define SIZEOF_XOFF_T 8
-#define SIZEOF_USIZE_T 4
-#ifndef WIN32
+#if SIZEOF_UNSIGNED_LONG == 8
+typedef unsigned long xoff_t;
+#define Q "l"
+#elif SIZEOF_SIZE_T == 8
+typedef size_t xoff_t;
+#define Q "z"
+#elif SIZEOF_UNSIGNED_LONG_LONG == 8
+typedef unsigned long long xoff_t;
 #define Q "ll"
 #else
+typedef uint64_t xoff_t;
 #define Q "I64"
 #endif
+
+#define SIZEOF_XOFF_T 8
+#define SIZEOF_USIZE_T 4
+#else
+#if SIZEOF_UNSIGNED_INT == 4
+typedef unsigned int xoff_t;
 #else
 typedef uint32_t xoff_t;
+#endif
+
 #define SIZEOF_XOFF_T 4
 #define SIZEOF_USIZE_T 4
 #define Q