From 314ca97f05884ccd38d19b975878b0ed9d753298 Mon Sep 17 00:00:00 2001 From: James Turk Date: Mon, 13 Oct 2003 21:07:33 +0000 Subject: [PATCH] zlib migration part III --- src/zlib/adler32.c | 4 ++-- src/zlib/compress.c | 4 ++-- src/zlib/crc32.c | 4 ++-- src/zlib/deflate.c | 4 ++-- src/zlib/gzio.c | 4 ++-- src/zlib/infblock.c | 10 ++++---- src/zlib/infcodes.c | 12 +++++----- src/zlib/inffast.c | 12 +++++----- src/zlib/inflate.c | 4 ++-- src/zlib/inftrees.c | 6 ++--- src/zlib/infutil.c | 10 ++++---- src/zlib/maketree.c | 4 ++-- src/zlib/trees.c | 6 ++--- src/zlib/uncompr.c | 4 ++-- src/zlib/unzip.c | 4 ++-- src/zlib/zutil.c | 4 ++-- vc7/ZEngine.vcproj | 58 ++++++++++++++++++++++----------------------- 17 files changed, 77 insertions(+), 77 deletions(-) diff --git a/src/zlib/adler32.c b/src/zlib/adler32.c index a137732..30e46ce 100755 --- a/src/zlib/adler32.c +++ b/src/zlib/adler32.c @@ -3,9 +3,9 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: adler32.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: adler32.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ -#include "zlib.h" +#include "zlib/zlib.h" #define BASE 65521L /* largest prime smaller than 65536 */ #define NMAX 5552 diff --git a/src/zlib/compress.c b/src/zlib/compress.c index 5cb9d73..dbc9c42 100755 --- a/src/zlib/compress.c +++ b/src/zlib/compress.c @@ -3,9 +3,9 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: compress.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: compress.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ -#include "zlib.h" +#include "zlib/zlib.h" /* =========================================================================== Compresses the source buffer into the destination buffer. The level diff --git a/src/zlib/crc32.c b/src/zlib/crc32.c index 4a13876..4437c6b 100755 --- a/src/zlib/crc32.c +++ b/src/zlib/crc32.c @@ -3,9 +3,9 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: crc32.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: crc32.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ -#include "zlib.h" +#include "zlib/zlib.h" #define local static diff --git a/src/zlib/deflate.c b/src/zlib/deflate.c index 0a67fd6..ed86355 100755 --- a/src/zlib/deflate.c +++ b/src/zlib/deflate.c @@ -47,9 +47,9 @@ * */ -/* @(#) $Id: deflate.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: deflate.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ -#include "deflate.h" +#include "zlib/deflate.h" const char deflate_copyright[] = " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly "; diff --git a/src/zlib/gzio.c b/src/zlib/gzio.c index 4f3e056..3f3e24f 100755 --- a/src/zlib/gzio.c +++ b/src/zlib/gzio.c @@ -5,11 +5,11 @@ * Compile this file with -DNO_DEFLATE to avoid the compression code. */ -/* @(#) $Id: gzio.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: gzio.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ #include -#include "zutil.h" +#include "zlib/zutil.h" struct internal_state {int dummy;}; /* for buggy compilers */ diff --git a/src/zlib/infblock.c b/src/zlib/infblock.c index 943e849..9c6c1a7 100755 --- a/src/zlib/infblock.c +++ b/src/zlib/infblock.c @@ -3,11 +3,11 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" -#include "infblock.h" -#include "inftrees.h" -#include "infcodes.h" -#include "infutil.h" +#include "zlib/zutil.h" +#include "zlib/infblock.h" +#include "zlib/inftrees.h" +#include "zlib/infcodes.h" +#include "zlib/infutil.h" struct inflate_codes_state {int dummy;}; /* for buggy compilers */ diff --git a/src/zlib/infcodes.c b/src/zlib/infcodes.c index aa7b3a0..9d7a8a1 100755 --- a/src/zlib/infcodes.c +++ b/src/zlib/infcodes.c @@ -3,12 +3,12 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" -#include "inftrees.h" -#include "infblock.h" -#include "infcodes.h" -#include "infutil.h" -#include "inffast.h" +#include "zlib/zutil.h" +#include "zlib/inftrees.h" +#include "zlib/infblock.h" +#include "zlib/infcodes.h" +#include "zlib/infutil.h" +#include "zlib/inffast.h" /* simplify the use of the inflate_huft type with some defines */ #define exop word.what.Exop diff --git a/src/zlib/inffast.c b/src/zlib/inffast.c index 655eaf0..1a3ec7d 100755 --- a/src/zlib/inffast.c +++ b/src/zlib/inffast.c @@ -3,12 +3,12 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" -#include "inftrees.h" -#include "infblock.h" -#include "infcodes.h" -#include "infutil.h" -#include "inffast.h" +#include "zlib/zutil.h" +#include "zlib/inftrees.h" +#include "zlib/infblock.h" +#include "zlib/infcodes.h" +#include "zlib/infutil.h" +#include "zlib/inffast.h" struct inflate_codes_state {int dummy;}; /* for buggy compilers */ diff --git a/src/zlib/inflate.c b/src/zlib/inflate.c index 5577e02..21e0b95 100755 --- a/src/zlib/inflate.c +++ b/src/zlib/inflate.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" -#include "infblock.h" +#include "zlib/zutil.h" +#include "zlib/infblock.h" struct inflate_blocks_state {int dummy;}; /* for buggy compilers */ diff --git a/src/zlib/inftrees.c b/src/zlib/inftrees.c index f89e801..8fa92b1 100755 --- a/src/zlib/inftrees.c +++ b/src/zlib/inftrees.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" -#include "inftrees.h" +#include "zlib/zutil.h" +#include "zlib/inftrees.h" #if !defined(BUILDFIXED) && !defined(STDC) # define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */ @@ -391,7 +391,7 @@ local uInt fixed_bd; local inflate_huft *fixed_tl; local inflate_huft *fixed_td; #else -#include "inffixed.h" +#include "zlib/inffixed.h" #endif diff --git a/src/zlib/infutil.c b/src/zlib/infutil.c index 976d5e5..b81bb33 100755 --- a/src/zlib/infutil.c +++ b/src/zlib/infutil.c @@ -3,11 +3,11 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#include "zutil.h" -#include "infblock.h" -#include "inftrees.h" -#include "infcodes.h" -#include "infutil.h" +#include "zlib/zutil.h" +#include "zlib/infblock.h" +#include "zlib/inftrees.h" +#include "zlib/infcodes.h" +#include "zlib/infutil.h" struct inflate_codes_state {int dummy;}; /* for buggy compilers */ diff --git a/src/zlib/maketree.c b/src/zlib/maketree.c index c64de51..75f3eae 100755 --- a/src/zlib/maketree.c +++ b/src/zlib/maketree.c @@ -17,8 +17,8 @@ #include #include -#include "zutil.h" -#include "inftrees.h" +#include "zlib/zutil.h" +#include "zlib/inftrees.h" /* simplify the use of the inflate_huft type with some defines */ #define exop word.what.Exop diff --git a/src/zlib/trees.c b/src/zlib/trees.c index b7c4a4b..4a1e901 100755 --- a/src/zlib/trees.c +++ b/src/zlib/trees.c @@ -29,11 +29,11 @@ * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -/* @(#) $Id: trees.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: trees.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ /* #define GEN_TREES_H */ -#include "deflate.h" +#include "zlib/deflate.h" #ifdef DEBUG # include @@ -115,7 +115,7 @@ local int base_dist[D_CODES]; /* First normalized distance for each code (0 = distance of 1) */ #else -# include "trees.h" +# include "zlib/trees.h" #endif /* GEN_TREES_H */ struct static_tree_desc_s { diff --git a/src/zlib/uncompr.c b/src/zlib/uncompr.c index 5e8549f..c886d18 100755 --- a/src/zlib/uncompr.c +++ b/src/zlib/uncompr.c @@ -3,9 +3,9 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: uncompr.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: uncompr.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ -#include "zlib.h" +#include "zlib/zlib.h" /* =========================================================================== Decompresses the source buffer into the destination buffer. sourceLen is diff --git a/src/zlib/unzip.c b/src/zlib/unzip.c index 67c123f..1a2c842 100755 --- a/src/zlib/unzip.c +++ b/src/zlib/unzip.c @@ -8,8 +8,8 @@ #include #include #include -#include "zlib.h" -#include "unzip.h" +#include "zlib/zlib.h" +#include "zlib/unzip.h" #ifdef STDC # include diff --git a/src/zlib/zutil.c b/src/zlib/zutil.c index 4014093..0fddd25 100755 --- a/src/zlib/zutil.c +++ b/src/zlib/zutil.c @@ -3,9 +3,9 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zutil.c,v 1.1 2003/10/13 21:01:25 cozman Exp $ */ +/* @(#) $Id: zutil.c,v 1.2 2003/10/13 21:07:33 cozman Exp $ */ -#include "zutil.h" +#include "zlib/zutil.h" struct internal_state {int dummy;}; /* for buggy compilers */ diff --git a/vc7/ZEngine.vcproj b/vc7/ZEngine.vcproj index 56d8162..7c321b6 100644 --- a/vc7/ZEngine.vcproj +++ b/vc7/ZEngine.vcproj @@ -21,7 +21,7 @@ Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="TRUE" - AdditionalIncludeDirectories="../include;../zlib" + AdditionalIncludeDirectories="../include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" StringPooling="TRUE" RuntimeLibrary="2" @@ -158,46 +158,46 @@ + RelativePath="..\include\zlib\deflate.h"> + RelativePath="..\include\zlib\infblock.h"> + RelativePath="..\include\zlib\infcodes.h"> + RelativePath="..\include\zlib\inffast.h"> + RelativePath="..\include\zlib\inffixed.h"> + RelativePath="..\include\zlib\inftrees.h"> + RelativePath="..\include\zlib\infutil.h"> + RelativePath="..\include\zlib\trees.h"> + RelativePath="..\include\zlib\unzip.h"> + RelativePath="..\include\zlib\zconf.h"> + RelativePath="..\include\zlib\zlib.h"> + RelativePath="..\include\zlib\zutil.h"> + RelativePath="..\src\zlib\adler32.c"> + RelativePath="..\src\zlib\compress.c"> + RelativePath="..\src\zlib\crc32.c"> + RelativePath="..\src\zlib\deflate.c"> + RelativePath="..\src\zlib\gzio.c"> + RelativePath="..\src\zlib\infblock.c"> + RelativePath="..\src\zlib\infcodes.c"> + RelativePath="..\src\zlib\inffast.c"> + RelativePath="..\src\zlib\inflate.c"> + RelativePath="..\src\zlib\inftrees.c"> + RelativePath="..\src\zlib\infutil.c"> + RelativePath="..\src\zlib\maketree.c"> + RelativePath="..\src\zlib\trees.c"> + RelativePath="..\src\zlib\uncompr.c"> + RelativePath="..\src\zlib\unzip.c"> + RelativePath="..\src\zlib\zutil.c">