Merge branch 'wimboot_fast'

[wimlib] / include / wimlib / xpress.h

diff --git a/include/wimlib/xpress.h b/include/wimlib/xpress.h
index c07dbae859aedebcf74d774e643068c387eed207..a7113153ded1ea7d6aa498c1449c97a28ab1a1af 100644 (file)
--- a/include/wimlib/xpress.h
+++ b/include/wimlib/xpress.h
@@ -1,14 +1,8 @@
 #ifndef _WIMLIB_XPRESS_H
 #define _WIMLIB_XPRESS_H
 
-/* See the comments in xpress-decompress.c about the XPRESS format. */
-
-//#define ENABLE_XPRESS_DEBUG
-#ifdef ENABLE_XPRESS_DEBUG
-#      define XPRESS_DEBUG DEBUG
-#else
-#      define XPRESS_DEBUG(format, ...)
-#endif
+/* Constants for the XPRESS data compression format.  See the comments in
+ * xpress-decompress.c for more information about this format.  */
 
 #define XPRESS_NUM_CHARS       256
 #define XPRESS_NUM_SYMBOLS     512
@@ -20,7 +14,7 @@
 #define XPRESS_MIN_OFFSET      1
 #define XPRESS_MAX_OFFSET      65535
 
-#define XPRESS_MIN_MATCH       3
-#define XPRESS_MAX_MATCH       65538
+#define XPRESS_MIN_MATCH_LEN   3
+#define XPRESS_MAX_MATCH_LEN   65538
 
 #endif /* _WIMLIB_XPRESS_H */