diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
| commit | 874ddcb0aede1fb8a3d8077bc11f08203e80b6ba (patch) | |
| tree | 78ec500df7858b45ed4c64d05ef135eaffa400f2 /dep/zlib/crc32.h | |
| parent | dba602ea1617c42c95fa9703d53f4af0a2b3f35d (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
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, |