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 f70c3701d..e600cb7a7 100644 --- a/archival/libarchive/bz/blocksort.c +++ b/archival/libarchive/bz/blocksort.c | |||
@@ -385,7 +385,7 @@ int mainGtU( | |||
385 | * but speeds up compression 10% overall | 385 | * but speeds up compression 10% overall |
386 | */ | 386 | */ |
387 | 387 | ||
388 | #if CONFIG_BZIP2_FEATURE_SPEED >= 1 | 388 | #if CONFIG_BZIP2_FAST >= 1 |
389 | 389 | ||
390 | #define TIMES_8(code) \ | 390 | #define TIMES_8(code) \ |
391 | code; code; code; code; \ | 391 | code; code; code; code; \ |
@@ -496,7 +496,7 @@ void mainSimpleSort(uint32_t* ptr, | |||
496 | i++; | 496 | i++; |
497 | 497 | ||
498 | /* 1.5% overall speedup, +290 bytes */ | 498 | /* 1.5% overall speedup, +290 bytes */ |
499 | #if CONFIG_BZIP2_FEATURE_SPEED >= 3 | 499 | #if CONFIG_BZIP2_FAST >= 3 |
500 | /*-- copy 2 --*/ | 500 | /*-- copy 2 --*/ |
501 | if (i > hi) break; | 501 | if (i > hi) break; |
502 | v = ptr[i]; | 502 | v = ptr[i]; |
@@ -750,7 +750,7 @@ void mainSort(EState* state, | |||
750 | j = block[0] << 8; | 750 | j = block[0] << 8; |
751 | i = nblock - 1; | 751 | i = nblock - 1; |
752 | /* 3%, +300 bytes */ | 752 | /* 3%, +300 bytes */ |
753 | #if CONFIG_BZIP2_FEATURE_SPEED >= 2 | 753 | #if CONFIG_BZIP2_FAST >= 2 |
754 | for (; i >= 3; i -= 4) { | 754 | for (; i >= 3; i -= 4) { |
755 | quadrant[i] = 0; | 755 | quadrant[i] = 0; |
756 | j = (j >> 8) | (((uint16_t)block[i]) << 8); | 756 | j = (j >> 8) | (((uint16_t)block[i]) << 8); |
@@ -787,7 +787,7 @@ void mainSort(EState* state, | |||
787 | 787 | ||
788 | s = block[0] << 8; | 788 | s = block[0] << 8; |
789 | i = nblock - 1; | 789 | i = nblock - 1; |
790 | #if CONFIG_BZIP2_FEATURE_SPEED >= 2 | 790 | #if CONFIG_BZIP2_FAST >= 2 |
791 | for (; i >= 3; i -= 4) { | 791 | for (; i >= 3; i -= 4) { |
792 | s = (s >> 8) | (block[i] << 8); | 792 | s = (s >> 8) | (block[i] << 8); |
793 | j = ftab[s] - 1; | 793 | j = ftab[s] - 1; |