Uniquely name crc32.c to avoid collissions with statically linked

builds
mme4crt · Apr 8, 2018 · 9639389 · 9639389
1 parent 816d805
commit 9639389
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -1472,7 +1472,7 @@ ifeq ($(HAVE_ZLIB), 1)
    ifeq ($(HAVE_BUILTINZLIB), 1)
       OBJ += $(DEPS_DIR)/libz/adler32.o \
              $(DEPS_DIR)/libz/compress.o \
-             $(DEPS_DIR)/libz/crc32.o \
+             $(DEPS_DIR)/libz/libz-crc32.o \
              $(DEPS_DIR)/libz/deflate.o \
              $(DEPS_DIR)/libz/gzclose.o \
              $(DEPS_DIR)/libz/gzlib.o \

diff --git a/deps/libz/crc32.c → deps/libz/libz-crc32.c b/deps/libz/crc32.c → deps/libz/libz-crc32.c
diff --git a/griffin/griffin.c b/griffin/griffin.c
@@ -1267,7 +1267,7 @@ DEPENDENCIES
 #ifdef WANT_ZLIB
 #include "../deps/libz/adler32.c"
 #include "../deps/libz/compress.c"
-#include "../deps/libz/crc32.c"
+#include "../deps/libz/libz-crc32.c"
 #include "../deps/libz/deflate.c"
 #include "../deps/libz/gzclose.c"
 #include "../deps/libz/gzlib.c"