LZX: Allow max_block_size not a power of 2

[wimlib] / include / wimlib / lzx.h

diff --git a/include/wimlib/lzx.h b/include/wimlib/lzx.h
index 576d8bd5499db2567a87c15cd55630c364cb686d..97d4a691c62ab46f13de4a66840af687a8b99d58 100644 (file)
--- a/include/wimlib/lzx.h
+++ b/include/wimlib/lzx.h
@@ -15,10 +15,8 @@
 
 //#define ENABLE_LZX_DEBUG
 #ifdef ENABLE_LZX_DEBUG
-#      define LZX_DEBUG DEBUG
 #       define LZX_ASSERT wimlib_assert
 #else
-#      define LZX_DEBUG(format, ...)
 #      define LZX_ASSERT(...)
 #endif
 
@@ -67,8 +65,9 @@ lzx_get_position_slot_raw(u32 formatted_offset)
        }
 }
 
-extern bool lzx_window_size_valid(size_t window_size);
-extern unsigned lzx_get_num_main_syms(u32 window_size);
+extern unsigned lzx_get_window_order(size_t max_block_size);
+
+extern unsigned lzx_get_num_main_syms(unsigned window_order);
 
 /* Least-recently used queue for match offsets.  */
 struct lzx_lru_queue {