summaryrefslogtreecommitdiffstats
path: root/cpukit/zlib/crc32.c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-03-19 07:42:49 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-03-19 07:42:49 +0000
commit791d3cdcf73cf6721e91c1d5e0837c679944ce19 (patch)
tree17e6fc320aeab4fbfcf49103daf36323bf205f9a /cpukit/zlib/crc32.c
parent2011-03-18 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-791d3cdcf73cf6721e91c1d5e0837c679944ce19.tar.bz2
Update to zlib-1.2.5.
Diffstat (limited to 'cpukit/zlib/crc32.c')
-rw-r--r--cpukit/zlib/crc32.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/cpukit/zlib/crc32.c b/cpukit/zlib/crc32.c
index c97c869aa1..91be372d22 100644
--- a/cpukit/zlib/crc32.c
+++ b/cpukit/zlib/crc32.c
@@ -1,5 +1,5 @@
/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006 Mark Adler
+ * Copyright (C) 1995-2006, 2010 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*
* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -433,7 +433,6 @@ uLong ZEXPORT crc32_combine(crc1, crc2, len2)
return crc32_combine_(crc1, crc2, len2);
}
-#if (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64))
uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
uLong crc1;
uLong crc2;
@@ -441,4 +440,3 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
{
return crc32_combine_(crc1, crc2, len2);
}
-#endif /* (defined(_LARGEFILE64_SOURCE)||(_FILE_OFFSET_BITS == 64)) */