From 505be6b4cc8c142d4098f8c050e3c1075e1caf24 Mon Sep 17 00:00:00 2001 From: "josh.macdonald@gmail.com" Date: Sun, 15 Jul 2012 22:16:58 +0000 Subject: Compiles on gcc-4.6 --- xdelta3/xdelta3.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'xdelta3/xdelta3.c') 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 -#include - #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)); } -- cgit v1.2.3