diff options
author | Bradley T. Hughes <bradleythughes@fastmail.fm> | 2016-10-13 10:38:38 +0300 |
---|---|---|
committer | Evan Lucas <evanlucas@me.com> | 2016-10-15 01:01:11 +0300 |
commit | 8d2206fe41c902d9b6bac928049d2317f9965c7f (patch) | |
tree | 893c8a660cd591bbd8f8ab533bff7cd1449b2b0a | |
parent | 8c4fab0a28edfe32c3e7305fe55f0a1bc5e3200d (diff) |
build: add -DZLIB_CONST when building with --shared-zlib
Commit 782620f added the define only when building with the bundled
zlib. Using a shared zlib results in build breakage:
../src/inspector_agent.cc:179:16: error: assigning to 'Bytef *' (aka 'unsigned char *') from incompatible type
'const uint8_t *' (aka 'const unsigned char *')
strm.next_in = PROTOCOL_JSON + 3;
^ ~~~~~~~~~~~~~~~~~
1 error generated.
PR-URL: https://github.com/nodejs/node/pull/9077
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
-rw-r--r-- | node.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -477,6 +477,8 @@ }], [ 'node_shared_zlib=="false"', { 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ], + }, { + 'defines': [ 'ZLIB_CONST' ], }], [ 'node_shared_http_parser=="false"', { |