Patch: Library "libz" Windows VC6 Link Warnings Removed

[Conrad T. Pino]

Hi All,
====================================
Attached "Patch.txt" file removes these test programs
from "libz" build:

        zlib/example.c
        zlib/minizip.c

The files modified by attached "Patch.txt" file are:

        Note 2: cvsnt.mak

        Note 2: diff/libdiff.mak

        Note 2: lib/libcvs.mak

        Note 2: zlib/libz.dep
        Note 1: zlib/libz.dsp
        Note 2: zlib/libz.mak

with these notes:

        1. Revised Visual C++ 6.0 (VC6) .dsp file.
        2. VC generated .dep/.mak files.

Background and research follows at end of this message.

Attached "Patch.txt" file uses Windows/DOS new line standard.
====================================
The patch set has been tested as follows:

        Debug   mode builds in VC6 IDE,
        Release mode builds in VC6 IDE,
        Debug   mode batch builds,
        Release mode batch builds and

all build successfully with the expected warnings.
====================================
These entries are provided for convenience of committer:

./ChangeLog:

        * cvsnt.mak: Regenerated for "zlib/libz.dsp" change.

./diff/ChangeLog:

        * libdiff.mak: Regenerated for "../zlib/libz.dsp" change.

./lib/ChangeLog:

        * libcvs.mak: Regenerated for "../zlib/libz.dsp" change.

./zlib/ChangeLog:

        * libz.dsp: Drop "example.c" & "minigzip.c" from build.
        * libz.dep: Regenerated for "libz.dsp" change.
        * libz.mak: Regenerated for "libz.dsp" change.

for use or not at committer's discretion.
====================================
Best regards,

Conrad Pino

> From: Conrad T. Pino [mailto:Conrad@Pino.com]
> Sent: Saturday, April 17, 2004 11:46
> Subject: Library "libz" Windows Link Warnings Report
> 
> > From: Derek Robert Price [mailto:derek@ximbiot.com]
> > Sent: Saturday, April 17, 2004 04:57
> > Subject: Re: Patch: Visual C++ Library Project Renames - libcvs & libz
> > 
> > I noticed one mistake I don't have time to correct at the moment,
> > which is that libz.* is compiling minigzip.c and shouldn't be.
> > minigzip is a test executable.
> 
> > From: Conrad T. Pino [mailto:Conrad@Pino.com]
> > Sent: Saturday, April 17, 2004 10:35
> > Subject: RE: Patch: Visual C++ Library Project Renames - libcvs & libz
> > 
> > I can't take the credit since inclusion of this file precedes me.
> > See "zlib/zlib.dsp" file Revision 1.1, Apr 26 1999 UTC by kingdon:
> > http://ccvs.cvshome.org/source/browse/ccvs/zlib/Attic/zlib.dsp?rev=1.1
> > 
> > Nevertheless I'm happy to take responsibility.
> > 
> > I'll assemble a link warnings report and publish as new thread to
> > "Bug-CVS" for comment and recommendations very shortly.
> ====================
> Library "libz" Windows link warnings output follows:
> --------------------Configuration: libz - Win32 Debug--------------------
> Compiling...
> [snip]
> Creating library...
> example.obj : warning LNK4006: _main already defined in minigzip.obj; second 
> definition ignored
> ====================
> The single LNK4006 warning arises because files:
> 
>       zlib/example.c
>       zlib/minizip.c
> 
> both define an "int main( )" function.
> 
> I've looked at both files briefly and they both appear to be test
> programs as pointed out by Derek Price for "minizip.c".
> ====================
> Deep history of this library's build:
> 
> Review "zlib/zlib.dsp" file Revision 1.1, Apr 26 1999 UTC by kingdon:
> http://ccvs.cvshome.org/source/browse/ccvs/zlib/Attic/zlib.dsp?rev=1.1
> and please note that both:
> 
>       zlib/example.c
>       zlib/minizip.c
> 
> have been present in the build for quite some time.
> 
> Revision 1.2 occurred Mar 26 2004 UTC by dprice and I feel safe in
> assuming Derek Price made no changes with respect to the above.
> ====================
> I tested the removal of both files from the library build and their
> removal doesn't affect creation of "cvs.exe" file.
> ====================

Patch.txt
Description: Text document