Module Name: src
Committed By: tls
Date: Wed Mar 25 19:21:39 UTC 2009
Modified Files:
src/sys/lib/libkern: crc32.c
Log Message:
Fix compilation error on 64-bit platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libkern/crc32.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/crc32.c
diff -u src/sys/lib/libkern/crc32.c:1.2 src/sys/lib/libkern/crc32.c:1.3
--- src/sys/lib/libkern/crc32.c:1.2 Wed Mar 25 18:41:06 2009
+++ src/sys/lib/libkern/crc32.c Wed Mar 25 19:21:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crc32.c,v 1.2 2009/03/25 18:41:06 tls Exp $ */
+/* $NetBSD: crc32.c,v 1.3 2009/03/25 19:21:39 tls Exp $ */
/* crc32.c -- compute the CRC-32 of a data stream
*
@@ -19,8 +19,6 @@
#include <sys/param.h>
#include <machine/endian.h>
-#define z_ptrdiff_t int32_t
-
typedef uint32_t u4;
/* Definitions for doing the crc four data bytes at a time. */
@@ -50,7 +48,7 @@
c = (u4)crc;
c = ~c;
- while (len && ((z_ptrdiff_t)buf & 3)) {
+ while (len && ((uintptr_t)buf & 3)) {
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
len--;
}
@@ -94,7 +92,7 @@
c = REV((u4)crc);
c = ~c;
- while (len && ((z_ptrdiff_t)buf & 3)) {
+ while (len && ((uintptr_t)buf & 3)) {
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
len--;
}