diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-18 07:14:37 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-18 07:14:37 -0800 |
| commit | 16f6826ffda41ffa7bcb7fcd4bc35916875af55c (patch) | |
| tree | 81cddaa0db36b0b5d495220ca4a3df9347f27d24 /binding.gyp | |
| parent | ddcc39267089a4886c420af8776e572f24714cbb (diff) | |
| parent | c15cd723ebabbab4825480032b56a2ddd9a8b76b (diff) | |
Merge github.com:grpc/grpc into fix-proto-docker
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/binding.gyp b/binding.gyp index f7a21e56cd..07a06f7d66 100644 --- a/binding.gyp +++ b/binding.gyp @@ -55,7 +55,8 @@ 'UNICODE', '_UNICODE', 'NOMINMAX', - 'OPENSSL_NO_ASM' + 'OPENSSL_NO_ASM', + 'GPR_BACKWARDS_COMPATIBILITY_MODE' ], "msvs_settings": { 'VCCLCompilerTool': { @@ -78,7 +79,8 @@ # supports ALPN. The target is "[major].[minor].[patch]". We split by # periods and take the first field to get the major version. 'defines': [ - 'TSI_OPENSSL_ALPN_SUPPORT=<!(echo <(target) | cut -d. -f1)' + 'TSI_OPENSSL_ALPN_SUPPORT=<!(echo <(target) | cut -d. -f1)', + 'GPR_BACKWARDS_COMPATIBILITY_MODE' ], 'include_dirs': [ '<(node_root_dir)/deps/openssl/openssl/include', @@ -604,6 +606,7 @@ 'src/core/client_config/resolvers/sockaddr_resolver.c', 'src/core/client_config/subchannel.c', 'src/core/client_config/subchannel_factory.c', + 'src/core/client_config/subchannel_index.c', 'src/core/client_config/uri_parser.c', 'src/core/compression/algorithm.c', 'src/core/compression/message_compress.c', @@ -707,6 +710,7 @@ 'src/core/transport/transport_op_string.c', 'src/core/census/context.c', 'src/core/census/initialize.c', + 'src/core/census/log.c', 'src/core/census/operation.c', 'src/core/census/placeholders.c', 'src/core/census/tracing.c', |