aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/libarchive/bz/compress.c12
-rw-r--r--archival/libarchive/lzo1x_9x.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/archival/libarchive/bz/compress.c b/archival/libarchive/bz/compress.c
index e9f1afdaf..a7dd72d9e 100644
--- a/archival/libarchive/bz/compress.c
+++ b/archival/libarchive/bz/compress.c
@@ -501,14 +501,14 @@ void sendMTFValues(EState* s)
501 for (i = 0; i < 16; i++) { 501 for (i = 0; i < 16; i++) {
502 if (sizeof(long) <= 4) { 502 if (sizeof(long) <= 4) {
503 inUse16 = inUse16*2 + 503 inUse16 = inUse16*2 +
504 ((*(uint32_t*)&(s->inUse[i * 16 + 0]) 504 ((*(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 0])
505 | *(uint32_t*)&(s->inUse[i * 16 + 4]) 505 | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 4])
506 | *(uint32_t*)&(s->inUse[i * 16 + 8]) 506 | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 8])
507 | *(uint32_t*)&(s->inUse[i * 16 + 12])) != 0); 507 | *(bb__aliased_uint32_t*)&(s->inUse[i * 16 + 12])) != 0);
508 } else { /* Our CPU can do better */ 508 } else { /* Our CPU can do better */
509 inUse16 = inUse16*2 + 509 inUse16 = inUse16*2 +
510 ((*(uint64_t*)&(s->inUse[i * 16 + 0]) 510 ((*(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 0])
511 | *(uint64_t*)&(s->inUse[i * 16 + 8])) != 0); 511 | *(bb__aliased_uint64_t*)&(s->inUse[i * 16 + 8])) != 0);
512 } 512 }
513 } 513 }
514 514
diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c
index 897132987..3e331984d 100644
--- a/archival/libarchive/lzo1x_9x.c
+++ b/archival/libarchive/lzo1x_9x.c
@@ -94,7 +94,7 @@ typedef struct {
94 ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) ) 94 ( ((0x9f5f * ((((b[p]<<5)^b[p+1])<<5) ^ b[p+2])) >> 5) & (SWD_HSIZE-1) )
95 95
96#if defined(LZO_UNALIGNED_OK_2) 96#if defined(LZO_UNALIGNED_OK_2)
97# define HEAD2(b,p) (* (uint16_t *) &(b[p])) 97# define HEAD2(b,p) (* (bb__aliased_uint16_t *) &(b[p]))
98#else 98#else
99# define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8)) 99# define HEAD2(b,p) (b[p] ^ ((unsigned)b[p+1]<<8))
100#endif 100#endif