diff options
| -rw-r--r-- | deps/zlib/zlib.gyp | 4 | ||||
| -rw-r--r-- | node.gyp | 2 | ||||
| -rw-r--r-- | src/inspector_agent.cc | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index 65133d5fce..cf0b090d9e 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -12,7 +12,6 @@ { 'target_name': 'zlib', 'type': 'static_library', - 'defines': [ 'ZLIB_CONST' ], 'sources': [ 'adler32.c', 'compress.c', @@ -45,7 +44,6 @@ '.', ], 'direct_dependent_settings': { - 'defines': [ 'ZLIB_CONST' ], 'include_dirs': [ '.', ], @@ -74,12 +72,10 @@ 'direct_dependent_settings': { 'defines': [ 'USE_SYSTEM_ZLIB', - 'ZLIB_CONST', ], }, 'defines': [ 'USE_SYSTEM_ZLIB', - 'ZLIB_CONST', ], 'link_settings': { 'libraries': [ @@ -480,8 +480,6 @@ }], [ 'node_shared_zlib=="false"', { 'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ], - }, { - 'defines': [ 'ZLIB_CONST' ], }], [ 'node_shared_http_parser=="false"', { diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc index fdc8819286..740565444e 100644 --- a/src/inspector_agent.cc +++ b/src/inspector_agent.cc @@ -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); strm.avail_in = sizeof(PROTOCOL_JSON) - 3; std::vector<char> data(kDecompressedSize); strm.next_out = reinterpret_cast<Byte*>(&data[0]); |