diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-20 19:24:57 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-20 19:24:57 +0000 |
| commit | 59db187c853c32cdb031f6cc6af65f9df76c07ef (patch) | |
| tree | df82946ada84d286dfa1cbacbeadfc82cf0a68f7 /src/node/ext/channel_credentials.h | |
| parent | ae1e29eed96798cadfed15b2e1e63e92dcf6d36e (diff) | |
| parent | c4c296e2d8ad6b90f5e36e4739ae3d68c66ace1f (diff) | |
Merge branch 'tsan-c++' into hybrid
Diffstat (limited to 'src/node/ext/channel_credentials.h')
| -rw-r--r-- | src/node/ext/channel_credentials.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/ext/channel_credentials.h b/src/node/ext/channel_credentials.h index 89b115267f..e5c7439de2 100644 --- a/src/node/ext/channel_credentials.h +++ b/src/node/ext/channel_credentials.h @@ -34,8 +34,8 @@ #ifndef NET_GRPC_NODE_CHANNEL_CREDENTIALS_H_ #define NET_GRPC_NODE_CHANNEL_CREDENTIALS_H_ -#include <node.h> #include <nan.h> +#include <node.h> #include "grpc/grpc.h" #include "grpc/grpc_security.h" |