This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Re: ZLIB - update to 1.2.1
- From: Gary Thomas <gary at mlbassoc dot com>
- To: Jonathan Larmour <jifl at eCosCentric dot com>
- Cc: eCos patches <ecos-patches at ecos dot sourceware dot org>
- Date: Tue, 25 May 2004 07:32:31 -0600
- Subject: Re: ZLIB - update to 1.2.1
- Organization: MLB Associates
- References: <1085427371.19799.23.camel@hermes> <40B28A28.8060305@eCosCentric.com>
On Mon, 2004-05-24 at 17:50, Jonathan Larmour wrote:
> Gary Thomas wrote:
> > Primarily for much better/complete handling of gzip compatible streams.
>
> Shouldn't CYGSEM_COMPRESS_ZLIB_DEFLATE_MAKES_GZIP toggle NO_GZCOMPRESS and
> NO_GZIP ?
>
> Is it too late to define Z_PREFIX?
Done (with a little re-org).
Also, added some files I missed before (into CVS)
services/compress/zlib/current/src/inflate.h
services/compress/zlib/current/src/infback.c
--
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: services/compress/zlib/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/compress/zlib/current/ChangeLog,v
retrieving revision 1.11
diff -u -5 -p -r1.11 ChangeLog
--- services/compress/zlib/current/ChangeLog 24 May 2004 19:33:34 -0000 1.11
+++ services/compress/zlib/current/ChangeLog 25 May 2004 13:29:16 -0000
@@ -1,5 +1,14 @@
+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:
* tests/zlib1.c:
* src/zutil.h:
Index: services/compress/zlib/current/include/zconf.h
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/compress/zlib/current/include/zconf.h,v
retrieving revision 1.5
diff -u -5 -p -r1.5 zconf.h
--- services/compress/zlib/current/include/zconf.h 24 May 2004 19:33:35 -0000 1.5
+++ services/compress/zlib/current/include/zconf.h 25 May 2004 13:26:24 -0000
@@ -6,10 +6,27 @@
/* @(#) $Id$ */
#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.
*/
#ifdef Z_PREFIX
@@ -316,19 +333,8 @@ typedef uLong FAR uLongf;
# pragma map(inflateSetDictionary,"INSEDI")
# pragma map(compressBound,"CMBND")
# pragma map(inflate_table,"INTABL")
# pragma map(inflate_fast,"INFA")
# 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 */
Index: services/compress/zlib/current/src/README.eCos
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/compress/zlib/current/src/README.eCos,v
retrieving revision 1.2
diff -u -5 -p -r1.2 README.eCos
--- services/compress/zlib/current/src/README.eCos 24 May 2004 19:33:35 -0000 1.2
+++ services/compress/zlib/current/src/README.eCos 25 May 2004 13:26:24 -0000
@@ -15,5 +15,10 @@ win32/
Additionally, local changes has been made to the remaining files. Code
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__)
+
Index: services/compress/zlib/current/src/zutil.h
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/compress/zlib/current/src/zutil.h,v
retrieving revision 1.4
diff -u -5 -p -r1.4 zutil.h
--- services/compress/zlib/current/src/zutil.h 24 May 2004 19:33:35 -0000 1.4
+++ services/compress/zlib/current/src/zutil.h 25 May 2004 13:26:24 -0000
@@ -15,10 +15,11 @@
#define ZLIB_INTERNAL
#ifdef __ECOS__
#include <cyg/compress/zlib.h>
#include <cyg/crc/crc.h>
+#undef crc32
#define crc32 cyg_ether_crc32_accumulate
#else
#include "zlib.h"
#endif // __ECOS__