diff -uNr linux-1.0.9/zBoot/gzip.h linux/zBoot/gzip.h --- linux-1.0.9/zBoot/gzip.h Wed Dec 1 13:44:15 1993 +++ linux/zBoot/gzip.h Mon Apr 1 15:37:33 2002 @@ -16,22 +16,8 @@ typedef char *voidp; #endif -/* I don't like nested includes, but the string functions are used too often */ -#if defined(HAVE_STRING_H) || defined(STDC_HEADERS) -# include -# define memzero(s, n) memset ((s), 0, (n)) -#else -# include -# define strchr index -# define strrchr rindex -# define memcpy(d, s, n) bcopy((s), (d), (n)) -# define memcmp(s1, s2, n) bcmp((s1), (s2), (n)) -# define memzero(s, n) bzero((s), (n)) -#endif - -#if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) -# include -#endif +#define NULL (void *)0 +#define memzero(s, n) memset ((s), 0, (n)) #ifndef RETSIGTYPE # define RETSIGTYPE void diff -uNr linux-1.0.9/zBoot/misc.c linux/zBoot/misc.c --- linux-1.0.9/zBoot/misc.c Wed Dec 1 13:44:15 1993 +++ linux/zBoot/misc.c Mon Apr 1 16:26:46 2002 @@ -13,6 +13,9 @@ #include +typedef void * __ptr_t; +typedef int size_t; + /* * These are set up by the setup-routine at boot-time: */