Skip to content

Commit 013db3d

Browse files
author
H. Peter Anvin (Intel)
committed
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) <hpa@zytor.com>
1 parent 378ee0e commit 013db3d

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ LIBOBJ_NW = \
185185
\
186186
nasmlib/ver.$(O) \
187187
nasmlib/alloc.$(O) nasmlib/asprintf.$(O) \
188-
nasmlib/crc32.$(O) nasmlib/crc64.$(O) nasmlib/md5c.$(O) \
188+
nasmlib/crc32b.$(O) nasmlib/crc64.$(O) nasmlib/md5c.$(O) \
189189
nasmlib/string.$(O) nasmlib/nctype.$(O) \
190190
nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \
191191
nasmlib/realpath.$(O) nasmlib/path.$(O) \

Mkfiles/msvc.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ LIBOBJ_NW = \
136136
\
137137
nasmlib\ver.obj \
138138
nasmlib\alloc.obj nasmlib\asprintf.obj \
139-
nasmlib\crc32.obj nasmlib\crc64.obj nasmlib\md5c.obj \
139+
nasmlib\crc32b.obj nasmlib\crc64.obj nasmlib\md5c.obj \
140140
nasmlib\string.obj nasmlib\nctype.obj \
141141
nasmlib\file.obj nasmlib\mmap.obj nasmlib\ilog2.obj \
142142
nasmlib\realpath.obj nasmlib\path.obj \

Mkfiles/openwcom.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ LIBOBJ_NW = &
121121
&
122122
nasmlib\ver.obj &
123123
nasmlib\alloc.obj nasmlib\asprintf.obj &
124-
nasmlib\crc32.obj nasmlib\crc64.obj nasmlib\md5c.obj &
124+
nasmlib\crc32b.obj nasmlib\crc64.obj nasmlib\md5c.obj &
125125
nasmlib\string.obj nasmlib\nctype.obj &
126126
nasmlib\file.obj nasmlib\mmap.obj nasmlib\ilog2.obj &
127127
nasmlib\realpath.obj nasmlib\path.obj &
File renamed without changes.

0 commit comments

Comments
 (0)