Use "&Help" so wxMac doesn't make an extra help menu

[wxWidgets.git] / src / zlib / crc32.c

diff --git a/src/zlib/crc32.c b/src/zlib/crc32.c
index 52d9cb1f44893e7591dad1fab8e19a0b32cdae4c..05ccd7a6ab83275efffa81097e76d3ea589e2bff 100644 (file)
--- a/src/zlib/crc32.c
+++ b/src/zlib/crc32.c
@@ -1,6 +1,6 @@
 /* crc32.c -- compute the CRC-32 of a data stream
 /* crc32.c -- compute the CRC-32 of a data stream

- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
+ * Copyright (C) 1995-2002 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h

  */
 
 /* @(#) $Id$ */
  */
 
 /* @(#) $Id$ */


@@ -51,7 +51,7 @@ local void make_crc_table()
   poly = 0L;
   for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
     poly |= 1L << (31 - p[n]);
   poly = 0L;
   for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
     poly |= 1L << (31 - p[n]);

- 
+

   for (n = 0; n < 256; n++)
   {
     c = (uLong)n;
   for (n = 0; n < 256; n++)
   {
     c = (uLong)n;


@@ -139,10 +139,14 @@ const uLongf * ZEXPORT get_crc_table()
 #define DO8(buf)  DO4(buf); DO4(buf);
 
 /* ========================================================================= */
 #define DO8(buf)  DO4(buf); DO4(buf);
 
 /* ========================================================================= */

+#if defined(__VISAGECPP__) /* Visualage can't handle this antiquated interface */
+uLong ZEXPORT crc32(uLong crc, const Bytef* buf, uInt len)
+#else

 uLong ZEXPORT crc32(crc, buf, len)
     uLong crc;
     const Bytef *buf;
     uInt len;
 uLong ZEXPORT crc32(crc, buf, len)
     uLong crc;
     const Bytef *buf;
     uInt len;

+#endif

 {
     if (buf == Z_NULL) return 0L;
 #ifdef DYNAMIC_CRC_TABLE
 {
     if (buf == Z_NULL) return 0L;
 #ifdef DYNAMIC_CRC_TABLE