5823faadb1
* external/zlib/zlib.dif
* external/zlib/zconf.h
! Tweak to make it build with BCC (when this specific
constant is defined, f.e. by libharu).
* external/pcre/Makefile
! Tweak to make 8.02 work with BCC.
; NOTE: BCC is seemingly not tested/used by any important
external projects. If it goes like this, I will stop
doing these updates and leave them to real BCC users.
It's going against the flow.
* config/postinst.prg
* /V2 -> -V2 to make *nix shells happy.
143 lines
3.7 KiB
Plaintext
143 lines
3.7 KiB
Plaintext
diff -u ori\crc32.c .\crc32.c
|
|
--- ori\crc32.c Sun Apr 22 19:25:32 2007
|
|
+++ .\crc32.c Fri Apr 09 14:31:57 2010
|
|
@@ -19,6 +19,8 @@
|
|
one thread to use crc32().
|
|
*/
|
|
|
|
+#define NOBYFOUR
|
|
+
|
|
#ifdef MAKECRCH
|
|
# include <stdio.h>
|
|
# ifndef DYNAMIC_CRC_TABLE
|
|
diff -u ori\deflate.c .\deflate.c
|
|
--- ori\deflate.c Sat Feb 27 11:07:24 2010
|
|
+++ .\deflate.c Fri Apr 09 14:40:46 2010
|
|
@@ -51,6 +51,10 @@
|
|
|
|
#include "deflate.h"
|
|
|
|
+#ifdef STDC /* need ANSI C limits.h to determine sizes */
|
|
+# include <limits.h>
|
|
+#endif
|
|
+
|
|
const char deflate_copyright[] =
|
|
" deflate 1.2.4 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,7 +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.
|
|
*/
|
|
Only in .: ori
|
|
diff -u ori\zconf.h .\zconf.h
|
|
--- ori\zconf.h Sun Feb 21 16:38:24 2010
|
|
+++ .\zconf.h Sat Apr 10 10:04:40 2010
|
|
@@ -3,7 +3,7 @@
|
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
|
*/
|
|
|
|
-/* @(#) $Id$ */
|
|
+/* @(#) $Id: zconf.h 14300 2010-04-09 12:44:20Z vszakats $ */
|
|
|
|
#ifndef ZCONF_H
|
|
#define ZCONF_H
|
|
@@ -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
|
|
@@ -360,8 +371,10 @@
|
|
typedef Byte *voidp;
|
|
#endif
|
|
|
|
+#if 0
|
|
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
|
|
# define Z_HAVE_UNISTD_H
|
|
+#endif
|
|
#endif
|
|
|
|
#ifdef Z_HAVE_UNISTD_H
|
|
Only in .: zlib.dif
|
|
diff -u ori\zutil.c .\zutil.c
|
|
--- ori\zutil.c Sat Jan 09 15:23:48 2010
|
|
+++ .\zutil.c Fri Apr 09 14:35:47 2010
|
|
@@ -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 -u ori\zutil.h .\zutil.h
|
|
--- ori\zutil.h Sun Mar 14 10:24:44 2010
|
|
+++ .\zutil.h Fri Apr 09 14:37:01 2010
|
|
@@ -17,7 +17,7 @@
|
|
#include "zlib.h"
|
|
|
|
#ifdef STDC
|
|
-# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
|
|
+# if !(defined(_WINCE) && defined(_MSC_VER))
|
|
# include <stddef.h>
|
|
# endif
|
|
# include <string.h>
|
|
@@ -150,14 +150,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
|
|
|