XD3_WIN32: Handle size_t case in printf; avoid setting XD3_POSIX in Makefile

8 files changed, 39 insertions, 26 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index 29fa193..a1bb6d9 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -47,7 +47,6 @@ common_CFLAGS = \
               -DREGRESSION_TEST=1 \
               -DSECONDARY_DJW=1 \
               -DSECONDARY_FGK=1 \
-              -DXD3_POSIX=1 \
               -DXD3_MAIN=1
 
 if DEBUG_SYMBOLS
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index de33020..8b09ab3 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -9,8 +9,9 @@ export LDFLAGS
 
 LIBBASE=$HOME/lib
 
-MINGW_CCFLAGS="-DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0 -DXD3_WIN32=1 -DSHELL_TESTS=0"
-MINGW_LDFLAGS="-lmingw32"
+MINGW_CFLAGS="-DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0 -DXD3_WIN32=1 -DSHELL_TESTS=0"
+
+MINGW_LDFLAGS=""
 
 # Location where mingw-w64-build script runs.
 MINGW_BASE="/volume/home/jmacd/src/mingwb"
@@ -19,7 +20,7 @@ MINGW_BASE="/volume/home/jmacd/src/mingwb"
 # Run from the source dir.
 SRCDIR=$PWD
 
-rm -rf build
+rm -rf build/*/*/*
 
 function setup {
     aclocal -I m4
@@ -50,10 +51,12 @@ function buildit {
     (cd $D && $SRCDIR/configure \
                   --host=${host} \
                   --prefix=$PWD \
+                  --enable-static \
+                  --disable-shared \
                   --enable-debug-symbols)
 
-    # echo "Building $D ..."
-    # (cd $D && make all)
+    echo "Building $D ..."
+    (cd $D && make all)
     # echo "Installing $D ..."    
     # (cd $D && make install)
     # echo "Testing $D ..."
diff --git a/xdelta3/testing/modify.h b/xdelta3/testing/modify.h
index 023e6ce..93f7bde 100644
--- a/xdelta3/testing/modify.h
+++ b/xdelta3/testing/modify.h
@@ -12,12 +12,12 @@ public:
   enum Kind {
     MODIFY = 1,     // Mutate a certain range w/ random or supplied data
     ADD = 2,        // Insert random or supplied data
-    DELETE = 3,     // Delete a specified range of data
+    DELRANGE = 3,     // Delete a specified range of data
     COPY = 4,       // Copy from one region, inserting elsewhere
     MOVE = 5,       // Copy then delete copied-from range
     COPYOVER = 6    // Copy then delete copied-to range
 
-    // ADD, DELETE, and COPY change the file size
+    // ADD, DELRANGE, and COPY change the file size
     // MODIFY, MOVE, COPYOVER preserve the file size
   };
 
@@ -97,7 +97,7 @@ public:
     case Change::MODIFY:
       ModifyChange(ch, table, source_table, rand);
       break;
-    case Change::DELETE:
+    case Change::DELRANGE:
       DeleteChange(ch, table, source_table, rand);
       break;
     case Change::COPY:
@@ -269,7 +269,7 @@ public:
     SegmentMap tmp;
     CHECK_NE(ch.addr1, ch.addr2);
     CopyChange(ch, &tmp, source_table, rand);
-    Change d(Change::DELETE, ch.size,
+    Change d(Change::DELRANGE, ch.size,
              ch.addr1 < ch.addr2 ? ch.addr1 : ch.addr1 + ch.size);
     DeleteChange(d, table, &tmp, rand);
   }
@@ -282,7 +282,7 @@ public:
     SegmentMap tmp;
     CHECK_NE(ch.addr1, ch.addr2);
     CopyChange(ch, &tmp, source_table, rand);
-    Change d(Change::DELETE, ch.size, ch.addr2 + ch.size);
+    Change d(Change::DELRANGE, ch.size, ch.addr2 + ch.size);
     DeleteChange(d, table, &tmp, rand);
   }
 
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index 566e4f5..a36bded 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -576,7 +576,7 @@ void TestDeleteMutator() {
 
   for (size_t i = 0; i < SIZEOF_ARRAY(test_cases); i++) {
     ChangeList cl1;
-    cl1.push_back(Change(Change::DELETE, test_cases[i].size,
+    cl1.push_back(Change(Change::DELRANGE, test_cases[i].size,
                          test_cases[i].addr));
     spec0.ModifyTo(ChangeListMutator(cl1), &spec1);
     CHECK_EQ(spec0.Size() - test_cases[i].size, spec1.Size());
@@ -1129,7 +1129,7 @@ void TestMergeCommand1() {
       }
 
       cl1.push_back(Change(Change::ADD, change1, add1_pos));
-      cl2.push_back(Change(Change::DELETE, change1, del2_pos));
+      cl2.push_back(Change(Change::DELRANGE, change1, del2_pos));
       cl3.push_back(Change(Change::MODIFY, change3, change3_pos));
 
       spec0.ModifyTo(ChangeListMutator(cl1), &spec1);
@@ -1183,9 +1183,9 @@ void TestMergeCommand2() {
 
           ChangeList cl1, cl2, cl3;
 
-          cl1.push_back(Change(Change::DELETE, size0 - size1, 0));
-          cl2.push_back(Change(Change::DELETE, size0 - size2, 0));
-          cl3.push_back(Change(Change::DELETE, size0 - size3, 0));
+          cl1.push_back(Change(Change::DELRANGE, size0 - size1, 0));
+          cl2.push_back(Change(Change::DELRANGE, size0 - size2, 0));
+          cl3.push_back(Change(Change::DELRANGE, size0 - size3, 0));
 
           spec0.ModifyTo(ChangeListMutator(cl1), &spec1);
           spec0.ModifyTo(ChangeListMutator(cl2), &spec2);
@@ -1259,7 +1259,7 @@ void UnitTest() {
 // These are Xdelta tests.
 template <class T>
 void MainTest() {
-  XPR(NT "Blocksize %"Q"u windowsize %zu\n",
+  XPR(NT "Blocksize %"Q"u windowsize %"Z"u\n",
       T::BLOCK_SIZE, T::WINDOW_SIZE);
   Regtest<T> regtest;
   TEST(TestEmptyInMemory);
diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h
index 080aebd..1ae663e 100644
--- a/xdelta3/xdelta3-blkcache.h
+++ b/xdelta3/xdelta3-blkcache.h
@@ -427,7 +427,7 @@ main_read_seek_source (xd3_stream *stream,
 
           if (nread != source->blksize)
             {
-              IF_DEBUG1 (DP(RINT "[getblk] short skip block nread = %zu\n",
+              IF_DEBUG1 (DP(RINT "[getblk] short skip block nread = %"Z"u\n",
                             nread));
               stream->msg = "non-seekable input is short";
               return XD3_INVALID_INPUT;
@@ -532,20 +532,20 @@ main_getblk_func (xd3_stream *stream,
         {
           if (blru->blkno != blkno)
             {
-              XPR(NT "source block %"Q"u read %zu ejects %"Q"u (lru_hits=%u, "
+              XPR(NT "source block %"Q"u read %"Z"u ejects %"Q"u (lru_hits=%u, "
                   "lru_misses=%u, lru_filled=%u)\n",
                   blkno, nread, blru->blkno, lru_hits, lru_misses, lru_filled);
             }
           else
             {
-              XPR(NT "source block %"Q"u read %zu (lru_hits=%u, "
+              XPR(NT "source block %"Q"u read %"Z"u (lru_hits=%u, "
                   "lru_misses=%u, lru_filled=%u)\n",
                   blkno, nread, lru_hits, lru_misses, lru_filled);
             }
         }
       else
         {
-          XPR(NT "source block %"Q"u read %zu (lru_hits=%u, lru_misses=%u, "
+          XPR(NT "source block %"Q"u read %"Z"u (lru_hits=%u, lru_misses=%u, "
               "lru_filled=%u)\n", blkno, nread, 
               lru_hits, lru_misses, lru_filled);
         }
@@ -557,7 +557,7 @@ main_getblk_func (xd3_stream *stream,
   blru->size       = nread;
   blru->blkno      = blkno;
 
-  IF_DEBUG1 (DP(RINT "[main_getblk] blkno %"Q"u onblk %zu pos %"Q"u "
+  IF_DEBUG1 (DP(RINT "[main_getblk] blkno %"Q"u onblk %"Z"u pos %"Q"u "
                 "srcpos %"Q"u\n",
                 blkno, nread, pos, sfile->source_position));
 
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index 72bf141..b14408f 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -82,12 +82,12 @@ typedef enum
 
 struct _main_file
 {
-#if XD3_STDIO
+#if XD3_WIN32
+  HANDLE              file;
+#elif XD3_STDIO
   FILE               *file;
 #elif XD3_POSIX
   int                 file;
-#elif XD3_WIN32
-  HANDLE              file;
 #endif
 
   int                 mode;          /* XO_READ and XO_WRITE */
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index d993bc4..875dd71 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1073,7 +1073,7 @@ main_file_read (main_file  *ifile,
     }
   else
     {
-      if (option_verbose > 4) { XPR(NT "read %s: %zu bytes\n",
+      if (option_verbose > 4) { XPR(NT "read %s: %"Z"u bytes\n",
                                     ifile->filename, (*nread)); }
       ifile->nread += (*nread);
     }
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 6e03c31..b317203 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -176,6 +176,16 @@ typedef unsigned long long xoff_t;
 #define Q "ll"
 #endif
 
+#ifdef _WIN32
+#if SIZEOF_SIZE_T == 4
+#define Z ""
+#elif SIZEOF_SIZE_T == 8
+#define Z "I64"
+#endif
+#else
+#define Z "z"
+#endif
+
 #define SIZEOF_XOFF_T 8
 #define SIZEOF_USIZE_T 4
 #else
@@ -188,6 +198,7 @@ typedef uint32_t xoff_t;
 #define SIZEOF_XOFF_T 4
 #define SIZEOF_USIZE_T 4
 #define Q
+#define Z
 #endif
 
 #define USE_UINT32 (SIZEOF_USIZE_T == 4 || \