diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 15:51:34 +0100 |
| commit | c7fed98b9ddef32b7c17d6022435b5bf8c4fa3f5 (patch) | |
| tree | 3ae3947ff14a14208f6ece4e635f0b5641c8c9d3 /dep/zlib/crc32.h | |
| parent | ffe8c75f17aa4c4059771265dd408055cb3c4e52 (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
dep/PackageList.txt
Diffstat (limited to 'dep/zlib/crc32.h')
| -rw-r--r-- | dep/zlib/crc32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/zlib/crc32.h b/dep/zlib/crc32.h index 8053b6117c0..9e0c7781025 100644 --- a/dep/zlib/crc32.h +++ b/dep/zlib/crc32.h @@ -2,7 +2,7 @@ * Generated automatically by crc32.c */ -local const unsigned long FAR crc_table[TBLS][256] = +local const z_crc_t FAR crc_table[TBLS][256] = { { 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, |