Changeset 7349ad5b in rtems

Timestamp:

Oct 28, 2005, 9:25:54 AM (14 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

8501446

Parents:

ce661e68

Message:

Misc. type fixes

Location:

cpukit/zlib

Files:

• crc32.c (modified) (3 diffs)
• zutil.c (modified) (1 diff)
• zutil.h (modified) (1 diff)

cpukit/zlib/crc32.c

@@ -202 +202 @@
  * This function can be used by asm versions of crc32()
  */
-const unsigned long FAR * ZEXPORT get_crc_table()
+const uLongf * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
@@ -208 +208 @@
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
+    return (const uLongf *)crc_table;
 }
 
@@ -216 +216 @@
 
 /* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
+uLong ZEXPORT crc32(crc, buf, len)
+    uLong crc;
+    const Bytef *buf;
+    uInt len;
 {
     if (buf == Z_NULL) return 0UL;

cpukit/zlib/zutil.c

@@ -300 +300 @@
 voidpf zcalloc (opaque, items, size)
     voidpf opaque;
-    unsigned items;
-    unsigned size;
+    uInt items;
+    uInt size;
 {
     if (opaque) items += size - size; /* make compiler happy */

cpukit/zlib/zutil.h

@@ -252 +252 @@
 
 
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
+voidpf zcalloc OF((voidpf opaque, uInt items, uInt size));
 void   zcfree  OF((voidpf opaque, voidpf ptr));