diff options
author | Josh MacDonald <josh.macdonald@gmail.com> | 2015-12-27 22:12:34 -0800 |
---|---|---|
committer | Josh MacDonald <josh.macdonald@gmail.com> | 2015-12-27 22:12:34 -0800 |
commit | ec9905aa755eafb64f08fc59ca7e67ea57498264 (patch) | |
tree | 304cae17d7d856c3ef465f7fad18398347272970 /xdelta3/xdelta3-internal.h | |
parent | dbbc4c4a59bb805a828bd61640ec8ba88fe92871 (diff) | |
parent | cf662894ba5b3847f06fd44dfb91f4733d9196f4 (diff) |
Merge frmo origin
Diffstat (limited to 'xdelta3/xdelta3-internal.h')
-rw-r--r-- | xdelta3/xdelta3-internal.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h index 6482721..d54584d 100644 --- a/xdelta3/xdelta3-internal.h +++ b/xdelta3/xdelta3-internal.h | |||
@@ -335,6 +335,7 @@ xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num) | |||
335 | 335 | ||
336 | #if SIZEOF_USIZE_T == 4 | 336 | #if SIZEOF_USIZE_T == 4 |
337 | #define USIZE_T_MAX UINT32_MAX | 337 | #define USIZE_T_MAX UINT32_MAX |
338 | #define USIZE_T_MAXBLKSZ 0x80000000U | ||
338 | #define xd3_decode_size xd3_decode_uint32_t | 339 | #define xd3_decode_size xd3_decode_uint32_t |
339 | #define xd3_emit_size xd3_emit_uint32_t | 340 | #define xd3_emit_size xd3_emit_uint32_t |
340 | #define xd3_sizeof_size xd3_sizeof_uint32_t | 341 | #define xd3_sizeof_size xd3_sizeof_uint32_t |
@@ -342,9 +343,10 @@ xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num) | |||
342 | #define xd3_large_cksum xd3_large32_cksum | 343 | #define xd3_large_cksum xd3_large32_cksum |
343 | #define xd3_large_cksum_update xd3_large32_cksum_update | 344 | #define xd3_large_cksum_update xd3_large32_cksum_update |
344 | #define xd3_hash_multiplier xd3_hash_multiplier32 | 345 | #define xd3_hash_multiplier xd3_hash_multiplier32 |
345 | #define XD3_MAXSRCWINSZ (1ULL << 31) | 346 | #define XD3_MAXSRCWINSZ (1ULL << 31) |
346 | #elif SIZEOF_USIZE_T == 8 | 347 | #elif SIZEOF_USIZE_T == 8 |
347 | #define USIZE_T_MAX UINT64_MAX | 348 | #define USIZE_T_MAX UINT64_MAX |
349 | #define USIZE_T_MAXBLKSZ 0x8000000000000000ULL | ||
348 | #define xd3_decode_size xd3_decode_uint64_t | 350 | #define xd3_decode_size xd3_decode_uint64_t |
349 | #define xd3_emit_size xd3_emit_uint64_t | 351 | #define xd3_emit_size xd3_emit_uint64_t |
350 | #define xd3_sizeof_size xd3_sizeof_uint64_t | 352 | #define xd3_sizeof_size xd3_sizeof_uint64_t |
@@ -352,7 +354,7 @@ xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num) | |||
352 | #define xd3_large_cksum xd3_large64_cksum | 354 | #define xd3_large_cksum xd3_large64_cksum |
353 | #define xd3_large_cksum_update xd3_large64_cksum_update | 355 | #define xd3_large_cksum_update xd3_large64_cksum_update |
354 | #define xd3_hash_multiplier xd3_hash_multiplier64 | 356 | #define xd3_hash_multiplier xd3_hash_multiplier64 |
355 | #define XD3_MAXSRCWINSZ (1ULL << 61) | 357 | #define XD3_MAXSRCWINSZ (1ULL << 61) |
356 | #endif /* SIZEOF_USIZE_T */ | 358 | #endif /* SIZEOF_USIZE_T */ |
357 | 359 | ||
358 | #if SIZEOF_XOFF_T == 4 | 360 | #if SIZEOF_XOFF_T == 4 |