Mercurial > flash_v2
changeset 1653:9875d08a7ee7
Turn on Z_PREFIX
| author | gthomas |
|---|---|
| date | Tue, 25 May 2004 13:30:07 +0000 |
| parents | 2a37dbf01ca2 |
| children | 2321e7aae37c |
| files | packages/services/compress/zlib/current/ChangeLog packages/services/compress/zlib/current/include/zconf.h packages/services/compress/zlib/current/src/README.eCos packages/services/compress/zlib/current/src/zutil.h |
| diffstat | 4 files changed, 32 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/services/compress/zlib/current/ChangeLog +++ b/packages/services/compress/zlib/current/ChangeLog @@ -1,3 +1,12 @@ +2004-05-25 Gary Thomas <gary@mlbassoc.com> + + * src/zutil.h: Fix redefine of 'crc32' + + * include/zconf.h: Force define of __ECOS__ to make it easier for + applications to use this library. Also define Z_PREFIX to minimize + namespace pollution. !CYGSEM_COMPRESS_ZLIB_DEFLATE_MAKES_GZIP now + implies NO_GZCOMPRESS and NO_GZIP. + 2004-05-24 Gary Thomas <gary@mlbassoc.com> * tests/zlib2.c:
--- a/packages/services/compress/zlib/current/include/zconf.h +++ b/packages/services/compress/zlib/current/include/zconf.h @@ -8,6 +8,23 @@ #ifndef ZCONF_H #define ZCONF_H +// #ifdef __ECOS__ +#undef __ECOS__ +#define __ECOS__ +#define Z_PREFIX +#include <pkgconf/compress_zlib.h> +#if CYGINT_COMPRESS_ZLIB_LOCAL_ALLOC != 0 +#define MY_ZCALLOC +#endif +#ifdef CYGSEM_COMPRESS_ZLIB_DEFLATE_MAKES_GZIP +#undef MAX_WBITS +#define MAX_WBITS 15+16 /* 32K LZ77 window */ +#else +#define NO_GZIP +#define NO_GZCOMPRESS +#endif +// #endif + /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. @@ -320,15 +337,4 @@ typedef uLong FAR uLongf; # pragma map(inflate_copyright,"INCOPY") #endif -#ifdef __ECOS__ -#include <pkgconf/compress_zlib.h> -#if CYGINT_COMPRESS_ZLIB_LOCAL_ALLOC != 0 -#define MY_ZCALLOC -#endif -#ifdef CYGSEM_COMPRESS_ZLIB_DEFLATE_MAKES_GZIP -#undef MAX_WBITS -#define MAX_WBITS 15+16 /* 32K LZ77 window */ -#endif -#endif - #endif /* ZCONF_H */
--- a/packages/services/compress/zlib/current/src/README.eCos +++ b/packages/services/compress/zlib/current/src/README.eCos @@ -17,3 +17,8 @@ Additionally, local changes has been mad changes are marked by __ECOS__ (comments or definitions). Finally, the headers zlib.h and zconf.h have been moved out of the directory into ../include. + +Note: zconf.h always defines __ECOS__. This is necessary to support +programs built outside of the eCos tree which may wish to use this +library (so those programs needn't worry about defining __ECOS__) +