diff options
| author | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
| commit | e99633a51cbd22b16606c2669c575c22cf1c511f (patch) | |
| tree | 784ef6b3eec7461e7b8962fee2d1ba6858b516b6 /erts/emulator/zlib/crc32.h | |
| parent | 990b655c92f889d2c45e6f43ee6fdae29ffc8464 (diff) | |
| parent | 9f57d8c4f86323cf7481c9a7e512486087bb5542 (diff) | |
| download | otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.gz otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.bz2 otp-e99633a51cbd22b16606c2669c575c22cf1c511f.zip | |
Merge branch 'bjorn/erts/zlib-1.2.8'
* bjorn/erts/zlib-1.2.8:
configure: Prefer the system's zlib over own our zlib source
Update preloaded modules
Add the 'rle' zstrategy
Don't make gzio.c dependent on the zutil.h header file
Update zlib to 1.2.8
erts/zlib: Remove unused file example.c
Diffstat (limited to 'erts/emulator/zlib/crc32.h')
| -rw-r--r-- | erts/emulator/zlib/crc32.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/erts/emulator/zlib/crc32.h b/erts/emulator/zlib/crc32.h index 49cd69a4c2..9e0c778102 100644 --- a/erts/emulator/zlib/crc32.h +++ b/erts/emulator/zlib/crc32.h @@ -2,9 +2,7 @@ * Generated automatically by crc32.c */ -/* %ExternalCopyright% */ - -local const unsigned long FAR crc_table[TBLS][256] = +local const z_crc_t FAR crc_table[TBLS][256] = { { 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, |