Merge pull request #108 from murgatroid99/master_1.9

Update master to 1.9.0-dev
2017-12-04 10:12:56 -08:00 · 2017-12-04 10:12:56 -08:00 · c1063eb73c
parent 6b4f75b5dc 872f1de0ae
commit c1063eb73c
3 changed files with 2 additions and 4 deletions
--- a/packages/grpc-native-core/deps/grpc
+++ b/packages/grpc-native-core/deps/grpc
@ -1 +1 @@
-Subproject commit 65212e06ef6f26edeb41411cd8a24d07f0ab6628
+Subproject commit ccd35033545226b9b38ab219c9eb8d0e4325b7c1
--- a/packages/grpc-native-core/ext/node_grpc.cc
+++ b/packages/grpc-native-core/ext/node_grpc.cc
@ -28,9 +28,7 @@
 #include "grpc/support/time.h"

 // TODO(murgatroid99): Remove this when the endpoint API becomes public
-extern "C" {
 #include "src/core/lib/iomgr/pollset_uv.h"
-}

 #include "call.h"
 #include "call_credentials.h"
--- a/packages/grpc-native-core/package.json
+++ b/packages/grpc-native-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc",
-  "version": "1.8.0-pre2",
+  "version": "1.9.0-dev",
  "author": "Google Inc.",
  "description": "gRPC Library for Node",
  "homepage": "https://grpc.io/",