diff options
author | josh.macdonald@gmail.com <josh.macdonald@gmail.com@a3eca27d-f21b-0410-9b4a-6511e771f64e> | 2012-07-15 22:16:58 +0000 |
---|---|---|
committer | josh.macdonald@gmail.com <josh.macdonald@gmail.com@a3eca27d-f21b-0410-9b4a-6511e771f64e> | 2012-07-15 22:16:58 +0000 |
commit | 505be6b4cc8c142d4098f8c050e3c1075e1caf24 (patch) | |
tree | 10def4dea1bd9c7d9f5cdad5dd2d076fda05e835 /xdelta3/xdelta3.c | |
parent | 7fab5abad768eed704ed7819567598b88228e790 (diff) |
Compiles on gcc-4.6
Diffstat (limited to 'xdelta3/xdelta3.c')
-rw-r--r-- | xdelta3/xdelta3.c | 15 |
1 files changed, 1 insertions, 14 deletions
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 @@ | |||
264 | #ifndef __XDELTA3_C_HEADER_PASS__ | 264 | #ifndef __XDELTA3_C_HEADER_PASS__ |
265 | #define __XDELTA3_C_HEADER_PASS__ | 265 | #define __XDELTA3_C_HEADER_PASS__ |
266 | 266 | ||
267 | #include <errno.h> | ||
268 | #include <string.h> | ||
269 | |||
270 | #include "xdelta3.h" | 267 | #include "xdelta3.h" |
271 | 268 | ||
272 | /*********************************************************************** | 269 | /*********************************************************************** |
@@ -570,14 +567,6 @@ static int xd3_selftest (void); | |||
570 | #define UINT32_OFLOW_MASK 0xfe000000U | 567 | #define UINT32_OFLOW_MASK 0xfe000000U |
571 | #define UINT64_OFLOW_MASK 0xfe00000000000000ULL | 568 | #define UINT64_OFLOW_MASK 0xfe00000000000000ULL |
572 | 569 | ||
573 | #ifndef UINT32_MAX | ||
574 | #define UINT32_MAX 4294967295U | ||
575 | #endif | ||
576 | |||
577 | #ifndef UINT64_MAX | ||
578 | #define UINT64_MAX 18446744073709551615ULL | ||
579 | #endif | ||
580 | |||
581 | #if SIZEOF_USIZE_T == 4 | 570 | #if SIZEOF_USIZE_T == 4 |
582 | #define USIZE_T_MAX UINT32_MAX | 571 | #define USIZE_T_MAX UINT32_MAX |
583 | #define xd3_decode_size xd3_decode_uint32_t | 572 | #define xd3_decode_size xd3_decode_uint32_t |
@@ -2623,10 +2612,8 @@ xd3_set_source (xd3_stream *stream, | |||
2623 | * calculations are cheap. */ | 2612 | * calculations are cheap. */ |
2624 | if (!xd3_check_pow2 (src->blksize, &shiftby) == 0) | 2613 | if (!xd3_check_pow2 (src->blksize, &shiftby) == 0) |
2625 | { | 2614 | { |
2626 | int check; | ||
2627 | src->blksize = xd3_pow2_roundup(src->blksize); | 2615 | src->blksize = xd3_pow2_roundup(src->blksize); |
2628 | check = xd3_check_pow2 (src->blksize, &shiftby); | 2616 | xd3_check_pow2 (src->blksize, &shiftby); |
2629 | XD3_ASSERT (check == 0); | ||
2630 | IF_DEBUG1 (DP(RINT "raising srcblksz to %u\n", src->blksize)); | 2617 | IF_DEBUG1 (DP(RINT "raising srcblksz to %u\n", src->blksize)); |
2631 | } | 2618 | } |
2632 | 2619 | ||