build: do not define ZLIB_CONST #9122
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
build
cjihrig
reviewed
Oct 16, 2016
| @@ -176,7 +176,7 @@ void SendProtocolJson(InspectorSocket* socket) { | |||
| PROTOCOL_JSON[0] * 0x10000u + | |||
| PROTOCOL_JSON[1] * 0x100u + | |||
| PROTOCOL_JSON[2]; | |||
| strm.next_in = PROTOCOL_JSON + 3; | |||
| strm.next_in = const_cast<uint8_t *>(PROTOCOL_JSON + 3); | |||
There was a problem hiding this comment.
No space before the * please.
|
@evantorrie can you test this change out? |
This define is not available in zlib prior to version 1.2.5.2. See nodejs#9110 for details. Workaround the build breakage reported by casting away const in src/inspector_agent.cc instead.
bradleythughes
force-pushed
the
do-not-use-ZLIB_CONST
branch
from
c4e7c71
to
efacdb4
Compare
|
@rvagg this may need to be included in this weeks v6 release |
|
Yes, I tested this patch out and it works for me (RHEL 6.8, --shared-zlib). |
cjihrig
approved these changes
Oct 17, 2016
|
landed @ a9f4fc9 |
rvagg
pushed a commit
that referenced
this pull request
Oct 18, 2016
This define is not available in zlib prior to version 1.2.5.2. See #9110 for details. Workaround the build breakage reported by casting away const in src/inspector_agent.cc instead. PR-URL: #9122 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
|
ack, this'll go in to 6.9.0 |
jasnell
pushed a commit
that referenced
this pull request
Oct 18, 2016
This define is not available in zlib prior to version 1.2.5.2. See #9110 for details. Workaround the build breakage reported by casting away const in src/inspector_agent.cc instead. PR-URL: #9122 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
|
@addaleax assuming this also does not need to land in v4.x |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
make -j8 test(UNIX), orvcbuild test nosign(Windows) passesAffected core subsystem(s)
build
Description of change
This define is not available in zlib prior to version 1.2.5.2. See
#9110 for details. Workaround the build breakage reported by
casting away const in src/inspector_agent.cc instead.