s/#ifdef CONFIG_/#if ENABLE_/g

3 files changed, 8 insertions, 6 deletions

diff --git a/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c
index 2800a7ecd..4f36c060f 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libunarchive/decompress_unlzma.c
@@ -12,7 +12,7 @@
 #include "libbb.h"
 #include "unarchive.h"
 
-#ifdef CONFIG_FEATURE_LZMA_FAST
+#if ENABLE_FEATURE_LZMA_FAST
 #  define speed_inline ALWAYS_INLINE
 #else
 #  define speed_inline
@@ -99,9 +99,11 @@ static ALWAYS_INLINE void rc_normalize(rc_t * rc)
         }
 }
 
-/* Called 9 times */
+/* rc_is_bit_0 is called 9 times */
 /* Why rc_is_bit_0_helper exists?
- * Because we want to always expose (rc->code < rc->bound) to optimizer
+ * Because we want to always expose (rc->code < rc->bound) to optimizer.
+ * Thus rc_is_bit_0 is always inlined, and rc_is_bit_0_helper is inlined
+ * only if we compile for speed.
  */
 static speed_inline uint32_t rc_is_bit_0_helper(rc_t * rc, uint16_t * p)
 {
diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index 0fb536fad..969dd1e3e 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -23,13 +23,13 @@ char filter_accept_list_reassign(archive_handle_t *archive_handle)
                 name_ptr = strrchr(archive_handle->file_header->name, '.');
 
                 /* Modify the subarchive handler based on the extension */
-#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+#if ENABLE_FEATURE_DEB_TAR_GZ
                 if (strcmp(name_ptr, ".gz") == 0) {
                         archive_handle->action_data_subarchive = get_header_tar_gz;
                         return EXIT_SUCCESS;
                 }
 #endif
-#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+#if ENABLE_FEATURE_DEB_TAR_BZ2
                 if (strcmp(name_ptr, ".bz2") == 0) {
                         archive_handle->action_data_subarchive = get_header_tar_bz2;
                         return EXIT_SUCCESS;
diff --git a/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c
index 6cd256418..edbf46b21 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libunarchive/seek_by_jump.c
@@ -9,7 +9,7 @@
 void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount)
 {
         if (lseek(archive_handle->src_fd, (off_t) amount, SEEK_CUR) == (off_t) -1) {
-#ifdef CONFIG_FEATURE_UNARCHIVE_TAPE
+#if ENABLE_FEATURE_UNARCHIVE_TAPE
                 if (errno == ESPIPE) {
                         seek_by_read(archive_handle, amount);
                 } else