avoid issue compiling on a mac

Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>

Author: kdt3rd

external/deflate/common_defs.h

@@ -309,7 +309,7 @@ typedef size_t machine_word_t;
 #define MAX(a, b)		((a) >= (b) ? (a) : (b))
 #define DIV_ROUND_UP(n, d)	(((n) + (d) - 1) / (d))
 #define STATIC_ASSERT(expr)	((void)sizeof(char[1 - 2 * !(expr)]))
-#define ALIGN(n, a)		(((n) + (a) - 1) & ~((a) - 1))
+#define DEFLATE_ALIGN(n, a)		(((n) + (a) - 1) & ~((a) - 1))
 #define ROUND_UP(n, d)		((d) * DIV_ROUND_UP((n), (d)))
 
 /* ========================================================================== */

external/deflate/lib/utils.c

@@ -46,7 +46,7 @@ libdeflate_aligned_malloc(malloc_func_t malloc_func,
 	if (ptr) {
 		void *orig_ptr = ptr;
 
-		ptr = (void *)ALIGN((uintptr_t)ptr + sizeof(void *), alignment);
+		ptr = (void *)DEFLATE_ALIGN((uintptr_t)ptr + sizeof(void *), alignment);
 		((void **)ptr)[-1] = orig_ptr;
 	}
 	return ptr;

external/patchup_deflate_lib.sed

@@ -1,2 +1,3 @@
 s/visibility("default/visibility("hidden/g
 s/__declspec(dllexport)//g
+s/ALIGN(/DEFLATE_ALIGN(/g

share/util/check_deflate.sh

@@ -24,6 +24,8 @@ if [[ -e current_deflate_version ]]; then
         rm -f libdeflate-config.cmake.in
         rm -rf scripts
         sed -i -f ../patchup_deflate_lib.sed lib/lib_common.h
+        sed -i -f ../patchup_deflate_lib.sed common_defs.h
+        sed -i -f ../patchup_deflate_lib.sed lib/utils.c
         cd ..
 
         rm "${filename}"