5 files changed, 17 insertions, 18 deletions

diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index f867055..d468669 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -429,7 +429,7 @@ xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst)
                 xd3_source *source = stream->src;
                 xoff_t block = source->cpyoff_blocks;
                 usize_t blkoff = source->cpyoff_blkoff;
-                const usize_t blksize = source->blksize;
+                const xoff_t blksize = source->blksize;
                 int ret;
 
                 xd3_blksize_add (&block, &blkoff, source, inst->addr);
diff --git a/xdelta3/xdelta3-fgk.h b/xdelta3/xdelta3-fgk.h
index 7011500..f145cc9 100644
--- a/xdelta3/xdelta3-fgk.h
+++ b/xdelta3/xdelta3-fgk.h
@@ -191,7 +191,7 @@ static fgk_stream* fgk_alloc (xd3_stream *stream /*, int alphabet_size0 */)
 static int fgk_init (xd3_stream *stream, fgk_stream *h, int is_encode)
 {
   usize_t ui;
-  ssize_t si;
+  size_t si;
 
   h->root_node       = h->alphabet;
   h->decode_ptr      = h->root_node;
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index 13f4a34..122cc02 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -40,7 +40,7 @@ int main_file_read (main_file  *ifile,
                     const char *msg);
 int main_file_write (main_file *ofile, uint8_t *buf, 
                      usize_t size, const char *msg);
-usize_t xd3_bytes_on_srcblk (xd3_source *src, xoff_t blkno);
+xoff_t xd3_bytes_on_srcblk (xd3_source *src, xoff_t blkno);
 xoff_t xd3_source_eof(const xd3_source *src);
 uint32_t xd3_large_cksum_update (uint32_t cksum,
                                  const uint8_t *base,
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index c22c763..2d6f926 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -2560,9 +2560,9 @@ xoff_t xd3_source_eof(const xd3_source *src)
 }
 
 inline
-usize_t xd3_bytes_on_srcblk (xd3_source *src, xoff_t blkno)
+xoff_t xd3_bytes_on_srcblk (xd3_source *src, xoff_t blkno)
 {
-  usize_t r = (blkno == src->max_blkno ?
+  xoff_t r = (blkno == src->max_blkno ?
                src->onlastblk :
                src->blksize);
   return r;
@@ -3697,7 +3697,7 @@ xd3_encode_init (xd3_stream *stream, int full_init)
       if (large_comp)
         {
           usize_t hash_values = (stream->src->max_winsize /
-                                 stream->smatcher.large_step);
+                                stream->smatcher.large_step);
 
           xd3_size_hashtable (stream,
                               hash_values,
@@ -4615,9 +4615,9 @@ xd3_source_extend_match (xd3_stream *stream)
                         of the input match being tested. */
   xoff_t tryblk;    /* tryblk, tryoff are the block, offset position
                        of matchoff */
-  usize_t tryoff;
-  usize_t tryrem;    /* tryrem is the number of matchable bytes */
-  usize_t matched;
+  xoff_t tryoff;
+  xoff_t tryrem;    /* tryrem is the number of matchable bytes */
+  xoff_t matched;
 
   IF_DEBUG2(DP(RINT "[extend match] srcpos %"Q"u\n",
                stream->match_srcpos));
@@ -5095,8 +5095,8 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point)
       xoff_t  blkno;
       xoff_t  blkbaseoffset;
       usize_t blkrem;
-      ssize_t oldpos;  /* Using ssize_t because of a  */
-      ssize_t blkpos;  /* do { blkpos-- }
+      size_t oldpos;  /* Using ssize_t because of a  */
+      size_t blkpos;  /* do { blkpos-- }
                           while (blkpos >= oldpos); */
       int ret;
       xd3_blksize_div (stream->srcwin_cksum_pos,
@@ -5126,7 +5126,7 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point)
 
       blkpos = xd3_bytes_on_srcblk (stream->src, blkno);
 
-      if (blkpos < (ssize_t) stream->smatcher.large_look)
+      if (blkpos < (size_t) stream->smatcher.large_look)
         {
           stream->srcwin_cksum_pos = (blkno + 1) * stream->src->blksize;
           IF_DEBUG1 (DP(RINT "[srcwin_move_point] continue (end-of-block)\n"));
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 66def15..ec971b9 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -110,7 +110,6 @@
  */
 #ifndef _WIN32
 #include <stdint.h>
-typedef uint32_t usize_t;
 #else
 #define WIN32_LEAN_AND_MEAN
 #if XD3_USE_LARGEFILE64
@@ -125,10 +124,8 @@ typedef uint32_t usize_t;
 #define _WIN32_WINNT    0x0400
 #endif
 #include <windows.h>
-typedef uint32_t usize_t;
 #ifdef _MSC_VER
 #define inline
-typedef signed int     ssize_t;
 #if _MSC_VER < 1600
 typedef unsigned char  uint8_t;
 typedef unsigned short uint16_t;
@@ -144,6 +141,8 @@ typedef ULONGLONG      uint64_t;
 #endif
 #endif
 
+typedef uint32_t usize_t;
+
 #if XD3_USE_LARGEFILE64
 #define __USE_FILE_OFFSET64 1 /* GLIBC: for 64bit fileops, ... ? */
 #ifndef _LARGEFILE_SOURCE
@@ -753,7 +752,7 @@ struct _xd3_source
                                         * source position to be read.
                                         * Otherwise, equal to
                                         * max_blkno. */
-  usize_t             onlastblk;  /* Number of bytes on max_blkno */
+  xoff_t             onlastblk;  /* Number of bytes on max_blkno */
   int                 eof_known;  /* Set to true when the first
                                    * partial block is read. */
 };
@@ -1315,9 +1314,9 @@ static inline
 void xd3_blksize_div (const xoff_t offset,
                       const xd3_source *source,
                       xoff_t *blkno,
-                      usize_t *blkoff) {
+                      xoff_t *blkoff) {
   *blkno = (xoff_t) (offset >> source->shiftby);
-  *blkoff = (usize_t) (offset & source->maskby);
+  *blkoff = (xoff_t) (offset & source->maskby);
   XD3_ASSERT (*blkoff < source->blksize);
 }