two many zlib's in the kernel

From: David Fries (dfries@mail.win.org)
Date: Sat Dec 08 2001 - 01:31:52 EST

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?

./fs/jffs2/zlib.c
./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 = 0;
---
>     static int static_init_done;

-- 
		+---------------------------------+
		|      David Fries                |
		|      dfries@mail.win.org        |
		| http://fries.net/~david/pgp.txt |
		+---------------------------------+
- 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/

This archive was generated by hypermail 2b29 : Sat Dec 15 2001 - 21:00:11 EST