diff options
| author | John Högberg <[email protected]> | 2018-10-17 09:43:58 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-10-17 09:43:58 +0200 |
| commit | e3bea67151cbd6d7df47f1bc68b460e3679ad678 (patch) | |
| tree | 9868db248da1982943a13b523076927c4b036847 /erts/emulator/beam/erl_alloc.c | |
| parent | e18ee8b3d0ced05a8905d20f486f025a26f7c8c8 (diff) | |
| parent | f6d91fb83484023182fd866bc75c7733c41a30a8 (diff) | |
| download | otp-e3bea67151cbd6d7df47f1bc68b460e3679ad678.tar.gz otp-e3bea67151cbd6d7df47f1bc68b460e3679ad678.tar.bz2 otp-e3bea67151cbd6d7df47f1bc68b460e3679ad678.zip | |
Merge branch 'john/erts/update-zlib/OTP-15351/ERL-749'
* john/erts/update-zlib/OTP-15351/ERL-749:
Update zlib to 1.2.11
Allow undefined macros when building zlib
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
0 files changed, 0 insertions, 0 deletions