diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2009-10-04 22:57:12 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-10-04 22:57:12 +0300 |
| commit | ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24 (patch) | |
| tree | 7e2f519ad2be01b8f9c7b230f71d479d550c9ae4 /src/liblzma/lzma | |
| parent | Add support for --enable-assume-ram=SIZE. (diff) | |
| download | xz-ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24.tar.xz | |
Use a tuklib module for integer handling.
This replaces bswap.h and integer.h.
The tuklib module uses <byteswap.h> on GNU,
<sys/endian.h> on *BSDs and <sys/byteorder.h>
on Solaris, which may contain optimized code
like inline assembly.
Diffstat (limited to 'src/liblzma/lzma')
| -rw-r--r-- | src/liblzma/lzma/lzma_decoder.c | 2 | ||||
| -rw-r--r-- | src/liblzma/lzma/lzma_encoder.c | 2 | ||||
| -rw-r--r-- | src/liblzma/lzma/lzma_encoder_private.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/liblzma/lzma/lzma_decoder.c b/src/liblzma/lzma/lzma_decoder.c index a013a62b..92c127f1 100644 --- a/src/liblzma/lzma/lzma_decoder.c +++ b/src/liblzma/lzma/lzma_decoder.c @@ -1042,7 +1042,7 @@ lzma_lzma_props_decode(void **options, lzma_allocator *allocator, // All dictionary sizes are accepted, including zero. LZ decoder // will automatically use a dictionary at least a few KiB even if // a smaller dictionary is requested. - opt->dict_size = integer_read_32(props + 1); + opt->dict_size = unaligned_read32le(props + 1); opt->preset_dict = NULL; opt->preset_dict_size = 0; diff --git a/src/liblzma/lzma/lzma_encoder.c b/src/liblzma/lzma/lzma_encoder.c index e9836978..0fe992d5 100644 --- a/src/liblzma/lzma/lzma_encoder.c +++ b/src/liblzma/lzma/lzma_encoder.c @@ -661,7 +661,7 @@ lzma_lzma_props_encode(const void *options, uint8_t *out) if (lzma_lzma_lclppb_encode(opt, out)) return LZMA_PROG_ERROR; - integer_write_32(out + 1, opt->dict_size); + unaligned_write32le(out + 1, opt->dict_size); return LZMA_OK; } diff --git a/src/liblzma/lzma/lzma_encoder_private.h b/src/liblzma/lzma/lzma_encoder_private.h index 017f58bd..3895de2d 100644 --- a/src/liblzma/lzma/lzma_encoder_private.h +++ b/src/liblzma/lzma/lzma_encoder_private.h @@ -24,7 +24,7 @@ // needed in lzma_lzma_optimum_*() to test if the match is at least // MATCH_LEN_MIN bytes. Unaligned access gives tiny gain so there's no // reason to not use it when it is supported. -#ifdef HAVE_FAST_UNALIGNED_ACCESS +#ifdef TUKLIB_FAST_UNALIGNED_ACCESS # define not_equal_16(a, b) \ (*(const uint16_t *)(a) != *(const uint16_t *)(b)) #else |