Allow hc_matchfinder and bt_matchfinder to be "templated"

[wimlib] / src / xpress_compress.c

diff --git a/src/xpress_compress.c b/src/xpress_compress.c
index 5298af64ddb342e8598ee090cef50d48393738c8..7020a88bba7013affb6ccfcf05ee7970e89a8d18 100644 (file)
--- a/src/xpress_compress.c
+++ b/src/xpress_compress.c
@@ -46,10 +46,10 @@
 #define MIN_LEVEL_FOR_NEAR_OPTIMAL     60
 
 /*
 #define MIN_LEVEL_FOR_NEAR_OPTIMAL     60
 
 /*

- * The maximum window order for the matchfinder.  This must be the base 2
- * logarithm of the maximum buffer size.
+ * Matchfinder definitions.  For XPRESS, only a 16-bit matchfinder is needed.

  */
  */

-#define MATCHFINDER_MAX_WINDOW_ORDER   16
+#define pos_t u16
+#define MF_SUFFIX

 
 /*
  * Note: although XPRESS can potentially use a sliding window, it isn't well
 
 /*
  * Note: although XPRESS can potentially use a sliding window, it isn't well


@@ -59,8 +59,6 @@
  * optimizations.
  */
 
  * optimizations.
  */
 

-#include <string.h>
-

 #include "wimlib/bitops.h"
 #include "wimlib/compress_common.h"
 #include "wimlib/compressor_ops.h"
 #include "wimlib/bitops.h"
 #include "wimlib/compress_common.h"
 #include "wimlib/compressor_ops.h"