diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-06-03 14:18:01 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-06-03 14:18:01 -0700 |
| commit | 55c08f81cff3d8231d4ae18b2a8f9e4abccc2d76 (patch) | |
| tree | 0ad9cdab1db83fe008829bdcfedf2525ab94d860 /src/csharp/ext | |
| parent | 3e4f49f88d611efb9573972a18ca727f50292d14 (diff) | |
| parent | 84f71932eaf8b601355189896fc5b91449ac82d2 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
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 49198cb708..4782654250 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 @@ -809,11 +809,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 |