8 files changed, 42 insertions, 37 deletions

diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index 9522032..ae148af 100755
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -221,7 +221,6 @@ xd3_decode_parse_halfinst (xd3_stream *stream, xd3_hinst *inst)
       (ret = xd3_read_size (stream,
                             & stream->inst_sect.buf,
                               stream->inst_sect.buf_max,
-
                             & inst->size)))
     {
       return XD3_INTERNAL;
diff --git a/xdelta3/xdelta3-djw.h b/xdelta3/xdelta3-djw.h
index 7479895..217928b 100755
--- a/xdelta3/xdelta3-djw.h
+++ b/xdelta3/xdelta3-djw.h
@@ -465,7 +465,7 @@ djw_build_prefix (const djw_weight *freq, uint8_t *clen, int asize, int maxlen)
     {
       IF_DEBUG (if (first_bits != total_bits)
       {
-        P(RINT "code length overflow changed %d bits\n", total_bits - first_bits);
+        P(RINT "code length overflow changed %u bits\n", (usize_t)(total_bits - first_bits));
       });
       return total_bits;
     }
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index b18e919..702b6b6 100755
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -971,15 +971,15 @@ main_print_window (xd3_stream* stream)
       if ((ret = xd3_decode_instruction (stream))) { return ret; }
 
       VC(UT "  %06"Q"u %03u  %s %3u", stream->dec_winstart + size, code,
-               xd3_rtype_to_string (stream->dec_current1.type, option_print_cpymode),
-               stream->dec_current1.size);
+         xd3_rtype_to_string (stream->dec_current1.type, option_print_cpymode),
+         (usize_t) stream->dec_current1.size);
 
       if (stream->dec_current1.type != XD3_NOOP)
         {
           size += stream->dec_current1.size;
           if (stream->dec_current1.type >= XD3_CPY)
             {
-              VC(UT " @%-6u", stream->dec_current1.addr);
+              VC(UT " @%-6u", (usize_t)stream->dec_current1.addr);
             }
           else
             {
@@ -991,12 +991,12 @@ main_print_window (xd3_stream* stream)
         {
           size += stream->dec_current2.size;
           VC(UT "  %s %3u",
-                   xd3_rtype_to_string (stream->dec_current2.type, option_print_cpymode),
-                   stream->dec_current2.size);
+             xd3_rtype_to_string (stream->dec_current2.type, option_print_cpymode),
+             (usize_t)stream->dec_current2.size);
 
           if (stream->dec_current2.type >= XD3_CPY)
             {
-              VC(UT " @%-6u", stream->dec_current2.addr);
+              VC(UT " @%-6u", (usize_t)stream->dec_current2.addr);
             }
         }
 
@@ -1095,7 +1095,7 @@ main_print_func (xd3_stream* stream, main_file *xfile)
 
   if ((stream->dec_win_ind & VCD_ADLER32) != 0)
     {
-      VC(UT "VCDIFF adler32 checksum:      %08X\n", stream->dec_adler32);
+      VC(UT "VCDIFF adler32 checksum:      %08X\n", (usize_t)stream->dec_adler32);
     }
 
   if (stream->dec_del_ind != 0)
@@ -1115,16 +1115,16 @@ main_print_func (xd3_stream* stream, main_file *xfile)
 
   if (SRCORTGT (stream->dec_win_ind))
     {
-      VC(UT "VCDIFF copy window length:    %u\n", stream->dec_cpylen);
+      VC(UT "VCDIFF copy window length:    %u\n", (usize_t)stream->dec_cpylen);
       VC(UT "VCDIFF copy window offset:    %"Q"u\n", stream->dec_cpyoff);
     }
 
-  VC(UT "VCDIFF delta encoding length: %u\n", stream->dec_enclen);
-  VC(UT "VCDIFF target window length:  %u\n", stream->dec_tgtlen);
+  VC(UT "VCDIFF delta encoding length: %u\n", (usize_t)stream->dec_enclen);
+  VC(UT "VCDIFF target window length:  %u\n", (usize_t)stream->dec_tgtlen);
 
-  VC(UT "VCDIFF data section length:   %u\n", stream->data_sect.size);
-  VC(UT "VCDIFF inst section length:   %u\n", stream->inst_sect.size);
-  VC(UT "VCDIFF addr section length:   %u\n", stream->addr_sect.size);
+  VC(UT "VCDIFF data section length:   %u\n", (usize_t)stream->data_sect.size);
+  VC(UT "VCDIFF inst section length:   %u\n", (usize_t)stream->inst_sect.size);
+  VC(UT "VCDIFF addr section length:   %u\n", (usize_t)stream->addr_sect.size);
 
   ret = 0; 
   if ((stream->flags & XD3_JUST_HDR) != 0)
diff --git a/xdelta3/xdelta3-regtest.py b/xdelta3/xdelta3-regtest.py
index 079eadc..8cdacac 100755
--- a/xdelta3/xdelta3-regtest.py
+++ b/xdelta3/xdelta3-regtest.py
@@ -46,7 +46,8 @@ MAX_RUN        = 1000 * 1000 * 10
 
 #
 #
-RCSDIR = '/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/PRCS'
+#RCSDIR = '/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/PRCS'
+RCSDIR = 'Z:/Polaroid/orbit_linux/home/jmacd/PRCS'
 
 TMPDIR = '/tmp/xd3regtest.%d' % os.getpid()
 
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 2307b7e..af90a90 100755
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -606,7 +606,7 @@ test_address_cache (xd3_stream *stream, int unused)
 
   for (offset = 1; offset < ADDR_CACHE_ROUNDS; offset += 1)
     {
-      usize_t addr;
+      uint32_t addr;
 
       if ((ret = xd3_decode_address (stream, offset, modes[offset], & buf, buf_max, & addr))) { return ret; }
 
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index e5c82d8..aaea811 100755
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -598,8 +598,13 @@ static int         xd3_selftest      (void);
 #define UINT32_OFLOW_MASK 0xfe000000U
 #define UINT64_OFLOW_MASK 0xfe00000000000000ULL
 
+#ifndef UINT32_MAX
 #define UINT32_MAX 4294967295U
+#endif
+
+#ifndef UINT64_MAX
 #define UINT64_MAX 18446744073709551615ULL
+#endif
 
 #if SIZEOF_USIZE_T == 4
 #define USIZE_T_MAX        UINT32_MAX
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 86a2662..fd91ac8 100755
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -95,7 +95,11 @@
 typedef unsigned int    usize_t;
 typedef u_int8_t        uint8_t;
 typedef u_int16_t       uint16_t;
+
+#ifndef __uint32_t_defined  /* Note: Cygwin compat */
 typedef u_int32_t       uint32_t;
+#endif
+
 typedef u_int64_t       uint64_t;
 #else
 // CRT_SECURE_NO_DEPRECATE silences warnings about sprintf() and strerror()
@@ -462,8 +466,8 @@ struct _xd3_dinst
 struct _xd3_hinst
 {
   uint8_t     type;
-  usize_t      size;
-  usize_t      addr;
+  uint32_t    size;
+  uint32_t    addr;
 };
 
 /* used by the encoder to buffer output in sections.  list of blocks. */
@@ -534,12 +538,12 @@ struct _xd3_desect
 {
   const uint8_t *buf;
   const uint8_t *buf_max;
-  usize_t         size;
-  usize_t         pos;
+  uint32_t       size;
+  usize_t        pos;
   uint8_t       *copied1;
-  usize_t         alloc1;
+  usize_t        alloc1;
   uint8_t       *copied2;
-  usize_t         alloc2;
+  usize_t        alloc2;
 };
 
 /******************************************************************************************
@@ -714,26 +718,26 @@ struct _xd3_stream
   uint              dec_del_ind;      /* VCDIFF delta indicator */
 
   uint8_t           dec_magic[4];     /* First four bytes */
-  usize_t            dec_magicbytes;   /* Magic position. */
+  usize_t           dec_magicbytes;   /* Magic position. */
 
-  uint               dec_secondid;     /* Optional secondary compressor ID. */
+  uint              dec_secondid;     /* Optional secondary compressor ID. */
 
-  usize_t            dec_codetblsz;    /* Optional code table: length. */
+  uint32_t          dec_codetblsz;    /* Optional code table: length. */
   uint8_t          *dec_codetbl;      /* Optional code table: storage. */
-  usize_t            dec_codetblbytes; /* Optional code table: position. */
+  usize_t           dec_codetblbytes; /* Optional code table: position. */
 
-  usize_t            dec_appheadsz;    /* Optional application header: size. */
+  uint32_t          dec_appheadsz;    /* Optional application header: size. */
   uint8_t          *dec_appheader;    /* Optional application header: storage */
-  usize_t            dec_appheadbytes; /* Optional application header: position. */
+  usize_t           dec_appheadbytes; /* Optional application header: position. */
 
   usize_t            dec_cksumbytes;   /* Optional checksum: position. */
   uint8_t           dec_cksum[4];     /* Optional checksum: storage. */
   uint32_t          dec_adler32;      /* Optional checksum: value. */
 
-  usize_t            dec_cpylen;       /* length of copy window (VCD_SOURCE or VCD_TARGET) */
-  xoff_t            dec_cpyoff;       /* offset of copy window (VCD_SOURCE or VCD_TARGET)  */
-  usize_t            dec_enclen;       /* length of delta encoding */
-  usize_t            dec_tgtlen;       /* length of target window */
+  uint32_t           dec_cpylen;       /* length of copy window (VCD_SOURCE or VCD_TARGET) */
+  xoff_t             dec_cpyoff;       /* offset of copy window (VCD_SOURCE or VCD_TARGET)  */
+  uint32_t           dec_enclen;       /* length of delta encoding */
+  uint32_t           dec_tgtlen;       /* length of target window */
 
 #if USE_UINT64
   uint64_t          dec_64part;       /* part of a decoded uint64_t */
diff --git a/xdelta3/xdelta3.vcproj b/xdelta3/xdelta3.vcproj
index 956bcec..e1c3625 100755
--- a/xdelta3/xdelta3.vcproj
+++ b/xdelta3/xdelta3.vcproj
@@ -173,10 +173,6 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

                         >

                         <File

-                                RelativePath=".\xdelta.h"

-                                >

-                        </File>

-                        <File

                                 RelativePath=".\xdelta3-cfgs.h"

                                 >

                         </File>