From 605f8f5033db3eed6a777c7ae7c0b299effee1c7 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 22 Mar 2019 09:38:37 -0600 Subject: [PATCH] rename "compress.[ch]" to avoid a conflict original commit: a4c635ae3da7853bbd2f63ffb25c3f16af33898b --- c/Makefile.a6nt | 6 +++--- c/Makefile.i3nt | 6 +++--- c/Makefile.ta6nt | 6 +++--- c/Makefile.ti3nt | 6 +++--- c/Mf-base | 6 +++--- c/{compress.c => compress-io.c} | 0 c/{compress.h => compress-io.h} | 0 c/system.h | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename c/{compress.c => compress-io.c} (100%) rename c/{compress.h => compress-io.h} (100%) diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt index f2d4fc84ea..48d8f5205b 100644 --- a/c/Makefile.a6nt +++ b/c/Makefile.a6nt @@ -51,15 +51,15 @@ csrc=statics.c segment.c alloc.c symbol.c intern.c gcwrapper.c gc-oce.c gc-ocd.c number.c schsig.c io.c new-io.c print.c fasl.c vfasl.c stats.c\ foreign.c prim.c prim5.c flushcache.c\ windows.c\ - schlib.c thread.c expeditor.c scheme.c compress.c + schlib.c thread.c expeditor.c scheme.c compress-io.c cobj=statics.obj segment.obj alloc.obj symbol.obj intern.obj gcwrapper.obj gc-oce.obj gc-ocd.obj\ number.obj schsig.obj io.obj new-io.obj print.obj fasl.obj vfasl.obj stats.obj\ foreign.obj prim.obj prim5.obj flushcache.obj\ windows.obj\ - schlib.obj thread.obj expeditor.obj scheme.obj compress.obj + schlib.obj thread.obj expeditor.obj scheme.obj compress-io.obj -hsrc=system.h types.h version.h globals.h externs.h compress.h segment.h gc.c thread.h sort.h itest.c +hsrc=system.h types.h version.h globals.h externs.h compress-io.h segment.h gc.c thread.h sort.h itest.c .SUFFIXES: diff --git a/c/Makefile.i3nt b/c/Makefile.i3nt index 82b0dddfe4..4352dc4ad6 100644 --- a/c/Makefile.i3nt +++ b/c/Makefile.i3nt @@ -50,15 +50,15 @@ csrc=statics.c segment.c alloc.c symbol.c intern.c gcwrapper.c gc-oce.c gc-ocd.c number.c schsig.c io.c new-io.c print.c fasl.c vfasl.c stats.c\ foreign.c prim.c prim5.c flushcache.c\ windows.c\ - schlib.c thread.c expeditor.c scheme.c compress.c + schlib.c thread.c expeditor.c scheme.c compress-io.c cobj=statics.obj segment.obj alloc.obj symbol.obj intern.obj gcwrapper.obj gc-oce.obj gc-ocd.obj\ number.obj schsig.obj io.obj new-io.obj print.obj fasl.obj vfasl.obj stats.obj\ foreign.obj prim.obj prim5.obj flushcache.obj\ windows.obj\ - schlib.obj thread.obj expeditor.obj scheme.obj compress.obj + schlib.obj thread.obj expeditor.obj scheme.obj compress-io.obj -hsrc=system.h types.h version.h globals.h externs.h compress.h segment.h gc.c thread.h sort.h itest.c +hsrc=system.h types.h version.h globals.h externs.h compress-io.h segment.h gc.c thread.h sort.h itest.c .SUFFIXES: diff --git a/c/Makefile.ta6nt b/c/Makefile.ta6nt index 7864544d39..82844e9c9b 100644 --- a/c/Makefile.ta6nt +++ b/c/Makefile.ta6nt @@ -51,15 +51,15 @@ csrc=statics.c segment.c alloc.c symbol.c intern.c gcwrapper.c gc-oce.c gc-ocd.c number.c schsig.c io.c new-io.c print.c fasl.c vfasl.c stats.c\ foreign.c prim.c prim5.c flushcache.c\ windows.c\ - schlib.c thread.c expeditor.c scheme.c compress.c + schlib.c thread.c expeditor.c scheme.c compress-io.c cobj=statics.obj segment.obj alloc.obj symbol.obj intern.obj gcwrapper.obj gc-oce.obj gc-ocd.obj\ number.obj schsig.obj io.obj new-io.obj print.obj fasl.obj vfasl.obj stats.obj\ foreign.obj prim.obj prim5.obj flushcache.obj\ windows.obj\ - schlib.obj thread.obj expeditor.obj scheme.obj compress.obj + schlib.obj thread.obj expeditor.obj scheme.obj compress-io.obj -hsrc=system.h types.h version.h globals.h externs.h compress.h segment.h gc.c thread.h sort.h itest.c +hsrc=system.h types.h version.h globals.h externs.h compress-io.h segment.h gc.c thread.h sort.h itest.c .SUFFIXES: diff --git a/c/Makefile.ti3nt b/c/Makefile.ti3nt index 66e2f24697..2eba6e81bf 100644 --- a/c/Makefile.ti3nt +++ b/c/Makefile.ti3nt @@ -50,15 +50,15 @@ csrc=statics.c segment.c alloc.c symbol.c intern.c gcwrapper.c gc-oce.c gc-ocd.c number.c schsig.c io.c new-io.c print.c fasl.c vfasl.c stats.c\ foreign.c prim.c prim5.c flushcache.c\ windows.c\ - schlib.c thread.c expeditor.c scheme.c compress.c + schlib.c thread.c expeditor.c scheme.c compress-io.c cobj=statics.obj segment.obj alloc.obj symbol.obj intern.obj gcwrapper.obj gc-oce.obj gc-ocd.obj\ number.obj schsig.obj io.obj new-io.obj print.obj fasl.obj vfasl.obj stats.obj\ foreign.obj prim.obj prim5.obj flushcache.obj\ windows.obj\ - schlib.obj thread.obj expeditor.obj scheme.obj compress.obj + schlib.obj thread.obj expeditor.obj scheme.obj compress-io.obj -hsrc=system.h types.h version.h globals.h externs.h compress.h segment.h gc.c thread.h sort.h itest.c +hsrc=system.h types.h version.h globals.h externs.h compress-io.h segment.h gc.c thread.h sort.h itest.c .SUFFIXES: diff --git a/c/Mf-base b/c/Mf-base index e4441220cc..b4eb27e42a 100644 --- a/c/Mf-base +++ b/c/Mf-base @@ -24,11 +24,11 @@ Scheme=../bin/$m/scheme kernelsrc=statics.c segment.c alloc.c symbol.c intern.c gcwrapper.c gc-ocd.c gc-oce.c\ number.c schsig.c io.c new-io.c print.c fasl.c vfasl.c stats.c foreign.c prim.c prim5.c flushcache.c\ - schlib.c thread.c expeditor.c scheme.c compress.c + schlib.c thread.c expeditor.c scheme.c compress-io.c kernelobj=${kernelsrc:%.c=%.$o} ${mdobj} -kernelhdr=system.h types.h version.h globals.h externs.h segment.h gc.c sort.h thread.h config.h compress.h itest.c nocurses.h +kernelhdr=system.h types.h version.h globals.h externs.h segment.h gc.c sort.h thread.h config.h compress-io.h itest.c nocurses.h mainsrc=main.c @@ -51,7 +51,7 @@ endif scheme.o: itest.c scheme.o main.o: config.h -${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h nocurses.h compress.h +${kernelobj}: system.h types.h version.h externs.h globals.h segment.h thread.h sort.h nocurses.h compress-io.h ${kernelobj}: ${Include}/equates.h ${Include}/scheme.h ${mainobj}: ${Include}/scheme.h ${kernelobj}: ${zlibHeaderDep} ${LZ4HeaderDep} diff --git a/c/compress.c b/c/compress-io.c similarity index 100% rename from c/compress.c rename to c/compress-io.c diff --git a/c/compress.h b/c/compress-io.h similarity index 100% rename from c/compress.h rename to c/compress-io.h diff --git a/c/system.h b/c/system.h index e2ab384213..287b826dc9 100644 --- a/c/system.h +++ b/c/system.h @@ -28,7 +28,7 @@ #include "version.h" #include -#include "compress.h" +#include "compress-io.h" #include #include "thread.h"