From 013db3d4463efe053314c345dcf6edcf5c43642d Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin (Intel)" Date: Thu, 9 Oct 2025 14:49:22 -0700 Subject: [PATCH] nasmlib: rename crc32.c to crc32b.c to avoid conflict with zlib/crc32.c For the benefit of those platforms which have to rely on VPATH, avoid having the same filename in multiple subdirectories. Signed-off-by: H. Peter Anvin (Intel) --- Makefile.in | 2 +- Mkfiles/msvc.mak | 2 +- Mkfiles/openwcom.mak | 2 +- nasmlib/{crc32.c => crc32b.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename nasmlib/{crc32.c => crc32b.c} (100%) diff --git a/Makefile.in b/Makefile.in index 20652b3b1..4f5f11e0b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -185,7 +185,7 @@ LIBOBJ_NW = \ \ nasmlib/ver.$(O) \ nasmlib/alloc.$(O) nasmlib/asprintf.$(O) \ - nasmlib/crc32.$(O) nasmlib/crc64.$(O) nasmlib/md5c.$(O) \ + nasmlib/crc32b.$(O) nasmlib/crc64.$(O) nasmlib/md5c.$(O) \ nasmlib/string.$(O) nasmlib/nctype.$(O) \ nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \ nasmlib/realpath.$(O) nasmlib/path.$(O) \ diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 155286f0b..6d2850115 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -136,7 +136,7 @@ LIBOBJ_NW = \ \ nasmlib\ver.obj \ nasmlib\alloc.obj nasmlib\asprintf.obj \ - nasmlib\crc32.obj nasmlib\crc64.obj nasmlib\md5c.obj \ + nasmlib\crc32b.obj nasmlib\crc64.obj nasmlib\md5c.obj \ nasmlib\string.obj nasmlib\nctype.obj \ nasmlib\file.obj nasmlib\mmap.obj nasmlib\ilog2.obj \ nasmlib\realpath.obj nasmlib\path.obj \ diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index d0ba5128b..b814421a5 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -121,7 +121,7 @@ LIBOBJ_NW = & & nasmlib\ver.obj & nasmlib\alloc.obj nasmlib\asprintf.obj & - nasmlib\crc32.obj nasmlib\crc64.obj nasmlib\md5c.obj & + nasmlib\crc32b.obj nasmlib\crc64.obj nasmlib\md5c.obj & nasmlib\string.obj nasmlib\nctype.obj & nasmlib\file.obj nasmlib\mmap.obj nasmlib\ilog2.obj & nasmlib\realpath.obj nasmlib\path.obj & diff --git a/nasmlib/crc32.c b/nasmlib/crc32b.c similarity index 100% rename from nasmlib/crc32.c rename to nasmlib/crc32b.c