diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-06-08 17:52:05 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-06-08 17:52:05 -0700 |
| commit | 0a0c1b0d59341e2535e27d86f1cd61f6c114b2ed (patch) | |
| tree | 7910593b0f6919ae7bc8269cb8394f4ac0502fd9 /src/csharp/ext | |
| parent | 2bdde23c25b2df3f5b94100226ca2957e4e2cba4 (diff) | |
| parent | d861b13aff7481b4901ab012cfd51c5887b11a2e (diff) | |
Merge remote-tracking branch 'upstream/master' into base64_decode
Diffstat (limited to 'src/csharp/ext')
| -rw-r--r-- | src/csharp/ext/grpc_csharp_ext.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c index 5b8ff9b819..2a243b94cb 100644 --- a/src/csharp/ext/grpc_csharp_ext.c +++ b/src/csharp/ext/grpc_csharp_ext.c @@ -45,7 +45,7 @@ #include <string.h> -#ifdef GPR_WIN32 +#ifdef GPR_WINDOWS #define GPR_EXPORT __declspec(dllexport) #define GPR_CALLTYPE __stdcall #endif @@ -806,11 +806,14 @@ GPR_EXPORT grpc_call_error GPR_CALLTYPE grpcsharp_call_set_credentials( /* Server */ GPR_EXPORT grpc_server *GPR_CALLTYPE -grpcsharp_server_create(grpc_completion_queue *cq, - const grpc_channel_args *args) { - grpc_server *server = grpc_server_create(args, NULL); +grpcsharp_server_create(const grpc_channel_args *args) { + return grpc_server_create(args, NULL); +} + +GPR_EXPORT void GPR_CALLTYPE +grpcsharp_server_register_completion_queue(grpc_server *server, + grpc_completion_queue *cq) { grpc_server_register_completion_queue(server, cq, NULL); - return server; } GPR_EXPORT int32_t GPR_CALLTYPE |