Move cleanup to inffast_tpl.h, clean up INFLATE_FAST

diff --git a/chunkset_tpl.h b/chunkset_tpl.h
index 035bb92cd1a8316128e7c77fa7bc6d95a79da8d7..d6e40e6f86c3b735e3dea471407ab324b4eabeff 100644 (file)
--- a/chunkset_tpl.h
+++ b/chunkset_tpl.h
@@ -279,19 +279,3 @@ static inline uint8_t *CHUNKCOPY_SAFE(uint8_t *out, uint8_t *from, uint64_t len,
 
     return CHUNKMEMSET(out, from, (unsigned)len);
 }
-
-// Cleanup
-#undef CHUNKCOPY
-#undef CHUNKMEMSET
-#undef CHUNKMEMSET_SAFE
-#undef CHUNKSIZE
-#undef CHUNKUNROLL
-#undef HAVE_CHUNKCOPY
-#undef HAVE_CHUNKMEMSET_2
-#undef HAVE_CHUNKMEMSET_4
-#undef HAVE_CHUNKMEMSET_8
-#undef HAVE_CHUNKMEMSET_16
-#undef HAVE_CHUNK_MAG
-#undef HAVE_HALFCHUNKCOPY
-#undef HAVE_HALF_CHUNK
-#undef HAVE_MASKED_READWRITE

diff --git a/inffast_tpl.h b/inffast_tpl.h
index 0723d135cfc285c84a0c58381c9dbf900f123370..aba9ca4bb39b7abd504bb1edd0623d6044c3b3d4 100644 (file)
--- a/inffast_tpl.h
+++ b/inffast_tpl.h
@@ -336,3 +336,20 @@ void Z_INTERNAL INFLATE_FAST(PREFIX3(stream) *strm, uint32_t start) {
    - Larger unrolled copy loops (three is about right)
    - Moving len -= 3 statement into middle of loop
  */
+
+ // Cleanup
+#undef CHUNKCOPY
+#undef CHUNKMEMSET
+#undef CHUNKMEMSET_SAFE
+#undef CHUNKSIZE
+#undef CHUNKUNROLL
+#undef HAVE_CHUNKCOPY
+#undef HAVE_CHUNKMEMSET_2
+#undef HAVE_CHUNKMEMSET_4
+#undef HAVE_CHUNKMEMSET_8
+#undef HAVE_CHUNKMEMSET_16
+#undef HAVE_CHUNK_MAG
+#undef HAVE_HALFCHUNKCOPY
+#undef HAVE_HALF_CHUNK
+#undef HAVE_MASKED_READWRITE
+#undef INFLATE_FAST