Move MIN() macro to zbuild.h

zlib-ng · Jun 1, 2021 · e2c6232 · e2c6232
1 parent c82714e
commit e2c6232
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/chunkset_tpl.h b/chunkset_tpl.h
@@ -2,10 +2,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#ifndef MIN
-#  define MIN(a, b) ((a) > (b) ? (b) : (a))
-#endif
-
 /* Returns the chunk size */
 Z_INTERNAL uint32_t CHUNKSIZE(void) {
     return sizeof(chunk_t);

diff --git a/deflate_p.h b/deflate_p.h
@@ -76,7 +76,4 @@ static inline int zng_tr_tally_dist(deflate_state *s, uint32_t dist, uint32_t le
 /* Maximum stored block length in deflate format (not including header). */
 #define MAX_STORED 65535
 
-/* Minimum of a and b. */
-#define MIN(a, b) ((a) > (b) ? (b) : (a))
-
 #endif
diff --git a/zbuild.h b/zbuild.h
@@ -26,4 +26,7 @@
 #  define z_size_t size_t
 #endif
 
+/* Minimum of a and b. */
+#define MIN(a, b) ((a) > (b) ? (b) : (a))
+
 #endif