Move cleanup undefs to insert_string_tpl.h

diff --git a/insert_string_p.h b/insert_string_p.h
index cd02234407f6bc1bc579cabf7408da028e04c705..e768b3eab1f5b9cf234f4bb193c32844976bef09 100644 (file)
--- a/insert_string_p.h
+++ b/insert_string_p.h
@@ -24,19 +24,6 @@
 
 #include "insert_string_tpl.h"
 
-// Cleanup
-#undef HASH_SLIDE
-#undef HASH_CALC
-#undef HASH_CALC_READ
-#undef HASH_CALC_MASK
-#undef HASH_CALC_OFFSET
-#undef HASH_CALC_VAR
-#undef HASH_CALC_VAR_INIT
-#undef UPDATE_HASH
-#undef INSERT_STRING
-#undef QUICK_INSERT_STRING
-#undef QUICK_INSERT_VALUE
-
 // Rolling insert_string, level 9
 #define HASH_SLIDE           5
 

diff --git a/insert_string_tpl.h b/insert_string_tpl.h
index 808405486415533d44855d96642a701656b209ca..a5c3abf3840db6bdbb6fc599d1b722ae145c8e76 100644 (file)
--- a/insert_string_tpl.h
+++ b/insert_string_tpl.h
@@ -117,3 +117,16 @@ Z_FORCEINLINE static void INSERT_STRING(deflate_state *const s, uint32_t str, ui
         }
     }
 }
+
+// Cleanup
+#undef HASH_SLIDE
+#undef HASH_CALC
+#undef HASH_CALC_READ
+#undef HASH_CALC_MASK
+#undef HASH_CALC_OFFSET
+#undef HASH_CALC_VAR
+#undef HASH_CALC_VAR_INIT
+#undef UPDATE_HASH
+#undef INSERT_STRING
+#undef QUICK_INSERT_STRING
+#undef QUICK_INSERT_VALUE