zlib migration part III

This commit is contained in:
James Turk 2003-10-13 21:07:33 +00:00
parent 4300a6bad2
commit 314ca97f05
17 changed files with 77 additions and 77 deletions

View File

@ -3,9 +3,9 @@
* For conditions of distribution and use, see copyright notice in zlib.h * 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 BASE 65521L /* largest prime smaller than 65536 */
#define NMAX 5552 #define NMAX 5552

View File

@ -3,9 +3,9 @@
* For conditions of distribution and use, see copyright notice in zlib.h * 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 Compresses the source buffer into the destination buffer. The level

View File

@ -3,9 +3,9 @@
* For conditions of distribution and use, see copyright notice in zlib.h * 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 #define local static

View File

@ -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[] = const char deflate_copyright[] =
" deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly "; " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";

View File

@ -5,11 +5,11 @@
* Compile this file with -DNO_DEFLATE to avoid the compression code. * 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 <stdio.h> #include <stdio.h>
#include "zutil.h" #include "zlib/zutil.h"
struct internal_state {int dummy;}; /* for buggy compilers */ struct internal_state {int dummy;}; /* for buggy compilers */

View File

@ -3,11 +3,11 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include "zutil.h" #include "zlib/zutil.h"
#include "infblock.h" #include "zlib/infblock.h"
#include "inftrees.h" #include "zlib/inftrees.h"
#include "infcodes.h" #include "zlib/infcodes.h"
#include "infutil.h" #include "zlib/infutil.h"
struct inflate_codes_state {int dummy;}; /* for buggy compilers */ struct inflate_codes_state {int dummy;}; /* for buggy compilers */

View File

@ -3,12 +3,12 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include "zutil.h" #include "zlib/zutil.h"
#include "inftrees.h" #include "zlib/inftrees.h"
#include "infblock.h" #include "zlib/infblock.h"
#include "infcodes.h" #include "zlib/infcodes.h"
#include "infutil.h" #include "zlib/infutil.h"
#include "inffast.h" #include "zlib/inffast.h"
/* simplify the use of the inflate_huft type with some defines */ /* simplify the use of the inflate_huft type with some defines */
#define exop word.what.Exop #define exop word.what.Exop

View File

@ -3,12 +3,12 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include "zutil.h" #include "zlib/zutil.h"
#include "inftrees.h" #include "zlib/inftrees.h"
#include "infblock.h" #include "zlib/infblock.h"
#include "infcodes.h" #include "zlib/infcodes.h"
#include "infutil.h" #include "zlib/infutil.h"
#include "inffast.h" #include "zlib/inffast.h"
struct inflate_codes_state {int dummy;}; /* for buggy compilers */ struct inflate_codes_state {int dummy;}; /* for buggy compilers */

View File

@ -3,8 +3,8 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include "zutil.h" #include "zlib/zutil.h"
#include "infblock.h" #include "zlib/infblock.h"
struct inflate_blocks_state {int dummy;}; /* for buggy compilers */ struct inflate_blocks_state {int dummy;}; /* for buggy compilers */

View File

@ -3,8 +3,8 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include "zutil.h" #include "zlib/zutil.h"
#include "inftrees.h" #include "zlib/inftrees.h"
#if !defined(BUILDFIXED) && !defined(STDC) #if !defined(BUILDFIXED) && !defined(STDC)
# define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */ # 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_tl;
local inflate_huft *fixed_td; local inflate_huft *fixed_td;
#else #else
#include "inffixed.h" #include "zlib/inffixed.h"
#endif #endif

View File

@ -3,11 +3,11 @@
* For conditions of distribution and use, see copyright notice in zlib.h * For conditions of distribution and use, see copyright notice in zlib.h
*/ */
#include "zutil.h" #include "zlib/zutil.h"
#include "infblock.h" #include "zlib/infblock.h"
#include "inftrees.h" #include "zlib/inftrees.h"
#include "infcodes.h" #include "zlib/infcodes.h"
#include "infutil.h" #include "zlib/infutil.h"
struct inflate_codes_state {int dummy;}; /* for buggy compilers */ struct inflate_codes_state {int dummy;}; /* for buggy compilers */

View File

@ -17,8 +17,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "zutil.h" #include "zlib/zutil.h"
#include "inftrees.h" #include "zlib/inftrees.h"
/* simplify the use of the inflate_huft type with some defines */ /* simplify the use of the inflate_huft type with some defines */
#define exop word.what.Exop #define exop word.what.Exop

View File

@ -29,11 +29,11 @@
* Addison-Wesley, 1983. ISBN 0-201-06672-6. * 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 */ /* #define GEN_TREES_H */
#include "deflate.h" #include "zlib/deflate.h"
#ifdef DEBUG #ifdef DEBUG
# include <ctype.h> # include <ctype.h>
@ -115,7 +115,7 @@ local int base_dist[D_CODES];
/* First normalized distance for each code (0 = distance of 1) */ /* First normalized distance for each code (0 = distance of 1) */
#else #else
# include "trees.h" # include "zlib/trees.h"
#endif /* GEN_TREES_H */ #endif /* GEN_TREES_H */
struct static_tree_desc_s { struct static_tree_desc_s {

View File

@ -3,9 +3,9 @@
* For conditions of distribution and use, see copyright notice in zlib.h * 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 Decompresses the source buffer into the destination buffer. sourceLen is

View File

@ -8,8 +8,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "zlib.h" #include "zlib/zlib.h"
#include "unzip.h" #include "zlib/unzip.h"
#ifdef STDC #ifdef STDC
# include <stddef.h> # include <stddef.h>

View File

@ -3,9 +3,9 @@
* For conditions of distribution and use, see copyright notice in zlib.h * 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 */ struct internal_state {int dummy;}; /* for buggy compilers */

View File

@ -21,7 +21,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OmitFramePointers="TRUE" OmitFramePointers="TRUE"
AdditionalIncludeDirectories="../include;../zlib" AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -158,46 +158,46 @@
<Filter <Filter
Name="Header Files"> Name="Header Files">
<File <File
RelativePath="..\zlib\deflate.h"> RelativePath="..\include\zlib\deflate.h">
</File> </File>
<File <File
RelativePath="..\zlib\infblock.h"> RelativePath="..\include\zlib\infblock.h">
</File> </File>
<File <File
RelativePath="..\zlib\infcodes.h"> RelativePath="..\include\zlib\infcodes.h">
</File> </File>
<File <File
RelativePath="..\zlib\inffast.h"> RelativePath="..\include\zlib\inffast.h">
</File> </File>
<File <File
RelativePath="..\zlib\inffixed.h"> RelativePath="..\include\zlib\inffixed.h">
</File> </File>
<File <File
RelativePath="..\zlib\inftrees.h"> RelativePath="..\include\zlib\inftrees.h">
</File> </File>
<File <File
RelativePath="..\zlib\infutil.h"> RelativePath="..\include\zlib\infutil.h">
</File> </File>
<File <File
RelativePath="..\zlib\trees.h"> RelativePath="..\include\zlib\trees.h">
</File> </File>
<File <File
RelativePath="..\zlib\unzip.h"> RelativePath="..\include\zlib\unzip.h">
</File> </File>
<File <File
RelativePath="..\zlib\zconf.h"> RelativePath="..\include\zlib\zconf.h">
</File> </File>
<File <File
RelativePath="..\zlib\zlib.h"> RelativePath="..\include\zlib\zlib.h">
</File> </File>
<File <File
RelativePath="..\zlib\zutil.h"> RelativePath="..\include\zlib\zutil.h">
</File> </File>
</Filter> </Filter>
<Filter <Filter
Name="Source Files"> Name="Source Files">
<File <File
RelativePath="..\zlib\adler32.c"> RelativePath="..\src\zlib\adler32.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -206,7 +206,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\compress.c"> RelativePath="..\src\zlib\compress.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -215,7 +215,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\crc32.c"> RelativePath="..\src\zlib\crc32.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -224,7 +224,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\deflate.c"> RelativePath="..\src\zlib\deflate.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -233,7 +233,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\gzio.c"> RelativePath="..\src\zlib\gzio.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -242,7 +242,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\infblock.c"> RelativePath="..\src\zlib\infblock.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -251,7 +251,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\infcodes.c"> RelativePath="..\src\zlib\infcodes.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -260,7 +260,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\inffast.c"> RelativePath="..\src\zlib\inffast.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -269,7 +269,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\inflate.c"> RelativePath="..\src\zlib\inflate.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -278,7 +278,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\inftrees.c"> RelativePath="..\src\zlib\inftrees.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -287,7 +287,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\infutil.c"> RelativePath="..\src\zlib\infutil.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -296,7 +296,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\maketree.c"> RelativePath="..\src\zlib\maketree.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -305,7 +305,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\trees.c"> RelativePath="..\src\zlib\trees.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -314,7 +314,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\uncompr.c"> RelativePath="..\src\zlib\uncompr.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -323,7 +323,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\unzip.c"> RelativePath="..\src\zlib\unzip.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
@ -332,7 +332,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\zlib\zutil.c"> RelativePath="..\src\zlib\zutil.c">
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool