two many zlib's in the kernel

David Fries (dfries@mail.win.org)
Sat, 8 Dec 2001 00:31:52 -0600


--RnlQjJ0d97Da+TV1
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Seems someone duplicated the zlib. One copy is in ppp the other is in
jffs2 as I listed below they are virtually identical. The problem is
you can't compile both in the kernel at the same time for obvious
reasons. Since I don't know the build code maybe someone else would
like to fix it?

=2E/fs/jffs2/zlib.c
=2E/drivers/net/zlib.c

diff ./fs/jffs2/zlib.c ./drivers/net/zlib.c
436c436
< /* Didn't use ct_data typedef below to supress compiler warning */

---
>     /* Didn't use ct_data typedef below to suppress compiler warning */
692c692
<  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
---
>  * IN  assertion: all calls to UPDATE_HASH are made with consecutive
703c703
<  * IN  assertion: all calls to to INSERT_STRING are made with consecutive
---
>  * IN  assertion: all calls to INSERT_STRING are made with consecutive
2068c2068
<     static int static_init_done =3D 0;
---
>     static int static_init_done;

--=20 +---------------------------------+ | David Fries | | dfries@mail.win.org | | http://fries.net/~david/pgp.txt | +---------------------------------+

--RnlQjJ0d97Da+TV1 Content-Type: application/pgp-signature Content-Disposition: inline

-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org

iEYEARECAAYFAjwRs9gACgkQAI852cse6PCrxQCfUGuUIPfOIol2oDonrabzcpn6 l88AoLDF0pi65lYDbcmrLH+UZo+VpYx+ =nttc -----END PGP SIGNATURE-----

--RnlQjJ0d97Da+TV1-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/