diff -urN zlib-1.2.5.orig/crc32.c zlib/crc32.c --- zlib-1.2.5.orig/crc32.c 2010-04-19 06:10:07.000000000 +0200 +++ zlib/crc32.c 2010-06-14 15:45:14.870220420 +0200 @@ -19,6 +19,8 @@ one thread to use crc32(). */ +#define NOBYFOUR + #ifdef MAKECRCH # include # ifndef DYNAMIC_CRC_TABLE diff -urN zlib-1.2.5.orig/deflate.c zlib/deflate.c --- zlib-1.2.5.orig/deflate.c 2010-04-20 06:12:21.000000000 +0200 +++ zlib/deflate.c 2010-06-14 15:45:14.880217303 +0200 @@ -51,6 +51,10 @@ #include "deflate.h" +#ifdef STDC /* need ANSI C limits.h to determine sizes */ +# include +#endif + const char deflate_copyright[] = " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; /* @@ -345,7 +349,7 @@ for (n = 0; n <= length - MIN_MATCH; n++) { INSERT_STRING(s, n, hash_head); } - if (hash_head) hash_head = 0; /* to make compiler happy */ + if (hash_head) {;} /* to make compiler happy */ return Z_OK; } @@ -1314,6 +1318,7 @@ more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); /* Deal with !@#$% 64K limit: */ +#if defined( UINT_MAX ) && UINT_MAX <= 0xFFFF if (sizeof(int) <= 2) { if (more == 0 && s->strstart == 0 && s->lookahead == 0) { more = wsize; @@ -1325,6 +1330,7 @@ more--; } } +#endif /* If the window is almost full and there is insufficient lookahead, * move the upper half to the lower one to make room in the upper half. @@ -1743,7 +1749,7 @@ int flush; { int bflush; /* set if current block must be flushed */ - uInt prev; /* byte at distance one to match */ + Byte prev; /* byte at distance one to match */ Bytef *scan, *strend; /* scan goes up to strend for length of run */ for (;;) { diff -urN zlib-1.2.5.orig/gzguts.h zlib/gzguts.h --- zlib-1.2.5.orig/gzguts.h 2010-04-18 21:28:32.000000000 +0200 +++ zlib/gzguts.h 2010-06-14 15:46:20.590631117 +0200 @@ -31,9 +31,19 @@ # define NO_GZCOMPRESS #endif -#ifdef _MSC_VER -# include -# define vsnprintf _vsnprintf +#if defined(MSDOS) + /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), + but for now we just assume it doesn't. */ +# define NO_vsnprintf +#elif defined(OS2) || defined(WINDOWS) || defined(WIN32) +# ifndef _WINCE +# include +# if defined(_MSC_VER) && !defined(__XCC__) +# define vsnprintf _vsnprintf +# endif +# endif +#else +# include #endif #ifndef local diff -urN zlib-1.2.5.orig/gzread.c zlib/gzread.c --- zlib-1.2.5.orig/gzread.c 2010-03-28 17:19:33.000000000 +0200 +++ zlib/gzread.c 2010-06-14 15:45:14.880217303 +0200 @@ -167,12 +167,12 @@ gz_error(state, Z_DATA_ERROR, "unknown header flags set"); return -1; } - NEXT(); /* modification time */ - NEXT(); - NEXT(); - NEXT(); - NEXT(); /* extra flags */ - NEXT(); /* operating system */ + (void) NEXT(); /* modification time */ + (void) NEXT(); + (void) NEXT(); + (void) NEXT(); + (void) NEXT(); /* extra flags */ + (void) NEXT(); /* operating system */ if (flags & 4) { /* extra field */ len = (unsigned)NEXT(); len += (unsigned)NEXT() << 8; @@ -187,8 +187,8 @@ while (NEXT() > 0) ; if (flags & 2) { /* header crc */ - NEXT(); - NEXT(); + (void) NEXT(); + (void) NEXT(); } /* an unexpected end of file is not checked for here -- it will be noticed on the first request for uncompressed data */ diff -urN zlib-1.2.5.orig/zconf.h zlib/zconf.h --- zlib-1.2.5.orig/zconf.h 2010-04-18 19:58:06.000000000 +0200 +++ zlib/zconf.h 2010-06-14 15:45:14.880217303 +0200 @@ -140,7 +140,18 @@ #if defined(_WINDOWS) && !defined(WINDOWS) # define WINDOWS #endif -#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +#if defined(__CEGCC__) || defined(__MINGW32CE__) || \ + defined(UNDER_CE) || defined(_WIN32_WCE) +# ifndef _WINCE +# define _WINCE +# endif +#endif +#if defined(_WINCE) +# ifndef NO_ERRNO_H +# define NO_ERRNO_H +# endif +#endif +#if defined(_WIN32) || defined(_WINCE) || defined(__WIN32__) # ifndef WIN32 # define WIN32 # endif diff -urN zlib-1.2.5.orig/zutil.c zlib/zutil.c --- zlib-1.2.5.orig/zutil.c 2010-04-19 06:14:13.000000000 +0200 +++ zlib/zutil.c 2010-06-14 15:45:14.880217303 +0200 @@ -136,7 +136,7 @@ return ERR_MSG(err); } -#if defined(_WIN32_WCE) +#if defined(_WINCE) /* The Microsoft C Run-Time Library for Windows CE doesn't have * errno. We define it as a global variable to simplify porting. * Its value is always 0 and should not be used. diff -urN zlib-1.2.5.orig/zutil.h zlib/zutil.h --- zlib-1.2.5.orig/zutil.h 2010-04-18 21:29:24.000000000 +0200 +++ zlib/zutil.h 2010-06-14 15:45:14.880217303 +0200 @@ -22,7 +22,7 @@ #include "zlib.h" #ifdef STDC -# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) +# if !(defined(_WINCE) && defined(_MSC_VER)) # include # endif # include @@ -142,14 +142,18 @@ #endif #if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX -# if defined(_WIN32_WCE) +# if defined(_WINCE) # define fdopen(fd,mode) NULL /* No fdopen() */ # ifndef _PTRDIFF_T_DEFINED typedef int ptrdiff_t; # define _PTRDIFF_T_DEFINED # endif # else -# define fdopen(fd,type) _fdopen(fd,type) +# if defined(__XCC__) +# define fdopen(fd,mode) NULL /* No fdopen() */ +# else +# define fdopen(fd,type) _fdopen(fd,type) +# endif # endif #endif @@ -199,7 +203,8 @@ # ifdef WIN32 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ # if !defined(vsnprintf) && !defined(NO_vsnprintf) -# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) +# if !defined(_MSC_VER) || \ + ( defined(_MSC_VER) && _MSC_VER < 1500 && !defined(__XCC__) ) # define vsnprintf _vsnprintf # endif # endif