X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fbt_matchfinder.h;h=8a69bca4acfed21bdbde39013e53711e7d4f0ff7;hp=70e4f143d65eddbf55a90615d066424da4fd5c31;hb=e9a04c1cb384cf3cf23d70107e85f79c4ac0a555;hpb=26396c2c45946ba38c18c6ac0207e8c1f68e4668

diff --git a/include/wimlib/bt_matchfinder.h b/include/wimlib/bt_matchfinder.h
index 70e4f143..8a69bca4 100644
--- a/include/wimlib/bt_matchfinder.h
+++ b/include/wimlib/bt_matchfinder.h
@@ -78,17 +78,17 @@ struct TEMPLATED(bt_matchfinder) {
 
 	/* The hash table for finding length 2 matches, if enabled  */
 #ifdef BT_MATCHFINDER_HASH2_ORDER
-	pos_t hash2_tab[1UL << BT_MATCHFINDER_HASH2_ORDER];
+	mf_pos_t hash2_tab[1UL << BT_MATCHFINDER_HASH2_ORDER];
 #endif
 
 	/* The hash table which contains the roots of the binary trees for
 	 * finding length 3 matches  */
-	pos_t hash3_tab[1UL << BT_MATCHFINDER_HASH3_ORDER];
+	mf_pos_t hash3_tab[1UL << BT_MATCHFINDER_HASH3_ORDER];
 
 	/* The child node references for the binary trees.  The left and right
 	 * children of the node for the sequence with position 'pos' are
 	 * 'child_tab[pos * 2]' and 'child_tab[pos * 2 + 1]', respectively.  */
-	pos_t child_tab[];
+	mf_pos_t child_tab[];
 };
 
 /* Return the number of bytes that must be allocated for a 'bt_matchfinder' that
@@ -97,7 +97,7 @@ static inline size_t
 TEMPLATED(bt_matchfinder_size)(size_t max_bufsize)
 {
 	return sizeof(struct TEMPLATED(bt_matchfinder)) +
-		(2 * max_bufsize * sizeof(pos_t));
+		(2 * max_bufsize * sizeof(mf_pos_t));
 }
 
 /* Prepare the matchfinder for a new input buffer.  */
@@ -107,13 +107,13 @@ TEMPLATED(bt_matchfinder_init)(struct TEMPLATED(bt_matchfinder) *mf)
 	memset(mf, 0, sizeof(*mf));
 }
 
-static inline pos_t *
+static inline mf_pos_t *
 TEMPLATED(bt_left_child)(struct TEMPLATED(bt_matchfinder) *mf, u32 node)
 {
 	return &mf->child_tab[(node << 1) + 0];
 }
 
-static inline pos_t *
+static inline mf_pos_t *
 TEMPLATED(bt_right_child)(struct TEMPLATED(bt_matchfinder) *mf, u32 node)
 {
 	return &mf->child_tab[(node << 1) + 1];
@@ -142,7 +142,7 @@ TEMPLATED(bt_matchfinder_advance_one_byte)(struct TEMPLATED(bt_matchfinder) * co
 	u32 hash3;
 	u32 cur_node;
 	const u8 *matchptr;
-	pos_t *pending_lt_ptr, *pending_gt_ptr;
+	mf_pos_t *pending_lt_ptr, *pending_gt_ptr;
 	u32 best_lt_len, best_gt_len;
 	u32 len;
 	u32 best_len = 2;