diff options
Diffstat (limited to 'archival/libarchive/bz/blocksort.c')
-rw-r--r-- | archival/libarchive/bz/blocksort.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archival/libarchive/bz/blocksort.c b/archival/libarchive/bz/blocksort.c index 0a9a597d0..92d6d8251 100644 --- a/archival/libarchive/bz/blocksort.c +++ b/archival/libarchive/bz/blocksort.c | |||
@@ -392,7 +392,7 @@ int mainGtU(EState* state, | |||
392 | * but speeds up compression 10% overall | 392 | * but speeds up compression 10% overall |
393 | */ | 393 | */ |
394 | 394 | ||
395 | #if CONFIG_BZIP2_FAST >= 1 | 395 | #if BZIP2_SPEED >= 1 |
396 | 396 | ||
397 | #define TIMES_8(code) \ | 397 | #define TIMES_8(code) \ |
398 | code; code; code; code; \ | 398 | code; code; code; code; \ |
@@ -506,7 +506,7 @@ void mainSimpleSort(EState* state, | |||
506 | i++; | 506 | i++; |
507 | 507 | ||
508 | /* 1.5% overall speedup, +290 bytes */ | 508 | /* 1.5% overall speedup, +290 bytes */ |
509 | #if CONFIG_BZIP2_FAST >= 3 | 509 | #if BZIP2_SPEED >= 3 |
510 | /*-- copy 2 --*/ | 510 | /*-- copy 2 --*/ |
511 | if (i > hi) break; | 511 | if (i > hi) break; |
512 | v = ptr[i]; | 512 | v = ptr[i]; |
@@ -755,7 +755,7 @@ void mainSort(EState* state) | |||
755 | j = block[0] << 8; | 755 | j = block[0] << 8; |
756 | i = nblock - 1; | 756 | i = nblock - 1; |
757 | /* 3%, +300 bytes */ | 757 | /* 3%, +300 bytes */ |
758 | #if CONFIG_BZIP2_FAST >= 2 | 758 | #if BZIP2_SPEED >= 2 |
759 | for (; i >= 3; i -= 4) { | 759 | for (; i >= 3; i -= 4) { |
760 | quadrant[i] = 0; | 760 | quadrant[i] = 0; |
761 | j = (j >> 8) | (((unsigned)block[i]) << 8); | 761 | j = (j >> 8) | (((unsigned)block[i]) << 8); |
@@ -794,7 +794,7 @@ void mainSort(EState* state) | |||
794 | unsigned s; | 794 | unsigned s; |
795 | s = block[0] << 8; | 795 | s = block[0] << 8; |
796 | i = nblock - 1; | 796 | i = nblock - 1; |
797 | #if CONFIG_BZIP2_FAST >= 2 | 797 | #if BZIP2_SPEED >= 2 |
798 | for (; i >= 3; i -= 4) { | 798 | for (; i >= 3; i -= 4) { |
799 | s = (s >> 8) | (block[i] << 8); | 799 | s = (s >> 8) | (block[i] << 8); |
800 | j = ftab[s] - 1; | 800 | j = ftab[s] - 1; |