Compiles on gcc-4.6

13 files changed, 22 insertions, 33 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index a40a993..0f1720d 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -44,9 +44,11 @@ common_CFLAGS = \
               -DXD3_MAIN=1
 
 xdelta3_CFLAGS = $(WFLAGS) $(common_CFLAGS) -pedantic -std=c99
+xdelta3_LDFLAGS = -lm
 
 xdelta3regtest_CXXFLAGS = $(WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
 xdelta3regtest_CFLAGS = $(WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
+xdelta3regtest_LDFLAGS = -lm
 
 man1_MANS = xdelta3.1
 
diff --git a/xdelta3/ltmain.sh b/xdelta3/ltmain.sh
index 377d47b..4159958 120000
--- a/xdelta3/ltmain.sh
+++ b/xdelta3/ltmain.sh
@@ -1 +1 @@
-/usr/local/share/libtool/config/ltmain.sh
\ No newline at end of file
+/usr/share/libtool/config/ltmain.sh
\ No newline at end of file
diff --git a/xdelta3/m4/libtool.m4 b/xdelta3/m4/libtool.m4
index d099988..f3504e9 120000
--- a/xdelta3/m4/libtool.m4
+++ b/xdelta3/m4/libtool.m4
@@ -1 +1 @@
-/usr/local/share/aclocal/libtool.m4
\ No newline at end of file
+/usr/share/aclocal/libtool.m4
\ No newline at end of file
diff --git a/xdelta3/m4/ltoptions.m4 b/xdelta3/m4/ltoptions.m4
index 981b657..b81279e 120000
--- a/xdelta3/m4/ltoptions.m4
+++ b/xdelta3/m4/ltoptions.m4
@@ -1 +1 @@
-/usr/local/share/aclocal/ltoptions.m4
\ No newline at end of file
+/usr/share/aclocal/ltoptions.m4
\ No newline at end of file
diff --git a/xdelta3/m4/ltsugar.m4 b/xdelta3/m4/ltsugar.m4
index 4953fb3..4d76cc7 120000
--- a/xdelta3/m4/ltsugar.m4
+++ b/xdelta3/m4/ltsugar.m4
@@ -1 +1 @@
-/usr/local/share/aclocal/ltsugar.m4
\ No newline at end of file
+/usr/share/aclocal/ltsugar.m4
\ No newline at end of file
diff --git a/xdelta3/m4/ltversion.m4 b/xdelta3/m4/ltversion.m4
index f5bd471..5eb474f 120000
--- a/xdelta3/m4/ltversion.m4
+++ b/xdelta3/m4/ltversion.m4
@@ -1 +1 @@
-/usr/local/share/aclocal/ltversion.m4
\ No newline at end of file
+/usr/share/aclocal/ltversion.m4
\ No newline at end of file
diff --git a/xdelta3/m4/lt~obsolete.m4 b/xdelta3/m4/lt~obsolete.m4
index 0d3c537..de0b9f9 120000
--- a/xdelta3/m4/lt~obsolete.m4
+++ b/xdelta3/m4/lt~obsolete.m4
@@ -1 +1 @@
-/usr/local/share/aclocal/lt~obsolete.m4
\ No newline at end of file
+/usr/share/aclocal/lt~obsolete.m4
\ No newline at end of file
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h
index 5b7eff9..f7c2ced 100644
--- a/xdelta3/testing/test.h
+++ b/xdelta3/testing/test.h
@@ -57,9 +57,6 @@ using std::ostream;
 using std::map;
 using std::pair;
 
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-
 #include <list>
 using std::list;
 
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index 9a728ff..10ecb38 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -18,12 +18,7 @@
 #ifndef XDELTA3_INTERNAL_H__
 #define XDELTA3_INTERNAL_H__
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#ifndef _XDELTA3_INTERNAL_H_
-#define _XDELTA3_INTERNAL_H_
+#include "xdelta3.h"
 
 typedef struct _main_file        main_file;
 typedef struct _main_extcomp     main_extcomp;
@@ -136,6 +131,12 @@ void xprintf(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
 #define NT "xdelta3: "
 #define NTR ""
 
+#ifndef UINT32_MAX
+#define UINT32_MAX 4294967295U
+#endif
+
+#ifndef UINT64_MAX
+#define UINT64_MAX 18446744073709551615ULL
 #endif
 
 #endif // XDELTA3_INTERNAL_H__
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index c853f4a..0c01092 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -3601,7 +3601,6 @@ int main (int argc, char **argv)
       s = strchr (flags, ret);
       if (s && s[1] && s[1] == ':')
         {
-          int eqcase = 0;
           int option = s[2] && s[2] == ':';
 
           /* Case 1, set optarg to the remaining characters. */
@@ -3638,7 +3637,6 @@ int main (int argc, char **argv)
             {
               /* Remove the = in all cases. */
               my_optarg += 1;
-              eqcase = 1;
 
               if (option && *my_optarg == 0)
                 {
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 63b7978..bd04f56 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -2369,7 +2369,6 @@ test_identical_behavior (xd3_stream *stream, int ignore)
   xd3_source source;
   int nextencwin = 0;
   int winstarts = 0, winfinishes = 0;
-  xoff_t srcwin = XOFF_T_MAX;
   usize_t delpos = 0, recsize;
   xd3_config config;
   memset(&source, 0, sizeof(source));
@@ -2405,7 +2404,6 @@ test_identical_behavior (xd3_stream *stream, int ignore)
           source.curblkno = source.getblkno;
           source.onblk    = IDB_BLKSZ;
           source.curblk   = buf + source.getblkno * IDB_BLKSZ;
-          srcwin = source.getblkno;
           continue;
         }
 
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 6a041d5..9d9e52c 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -264,9 +264,6 @@
 #ifndef __XDELTA3_C_HEADER_PASS__
 #define __XDELTA3_C_HEADER_PASS__
 
-#include <errno.h>
-#include <string.h>
-
 #include "xdelta3.h"
 
 /***********************************************************************
@@ -570,14 +567,6 @@ 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
 #define xd3_decode_size   xd3_decode_uint32_t
@@ -2623,10 +2612,8 @@ xd3_set_source (xd3_stream *stream,
    * calculations are cheap. */
   if (!xd3_check_pow2 (src->blksize, &shiftby) == 0)
     {
-      int check;
       src->blksize = xd3_pow2_roundup(src->blksize);
-      check = xd3_check_pow2 (src->blksize, &shiftby);
-      XD3_ASSERT (check == 0);
+      xd3_check_pow2 (src->blksize, &shiftby);
       IF_DEBUG1 (DP(RINT "raising srcblksz to %u\n", src->blksize));
     }
 
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index b31cbe9..1a4f838 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -25,7 +25,13 @@
 #ifndef _XDELTA3_H_
 #define _XDELTA3_H_
 
+#define _POSIX_SOURCE
+#define _ISOC99_SOURCE
+
+#include <errno.h>
+#include <stdarg.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>