diff options
| author |  Vijay Pai <vpai@google.com> | 2016-03-30 14:55:38 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2016-03-30 14:55:38 -0700 |
| commit | 828558ac4a8c18134a76dc94126f96627789770a (patch) | |
| tree | fafb5e60cd168876f5e7ce66b67d91d844434026 /src/core/lib/iomgr | |
| parent | d9389a849d29c304ad57388967824d2d9f2e2550 (diff) | |
| parent | 503c3caf0804c7b9e2619f7c58de6b2b415a8fb0 (diff) | |
Merge branch 'master' into i_know_rubies
Diffstat (limited to 'src/core/lib/iomgr')
| -rw-r--r-- | src/core/lib/iomgr/pollset_set_windows.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/pollset_set_windows.c b/src/core/lib/iomgr/pollset_set_windows.c index 0b14e446ae..720fc331ed 100644 --- a/src/core/lib/iomgr/pollset_set_windows.c +++ b/src/core/lib/iomgr/pollset_set_windows.c @@ -37,7 +37,7 @@ #include "src/core/lib/iomgr/pollset_set_windows.h" -grpc_pollset_set* grpc_pollset_set_create(pollset_set) { return NULL; } +grpc_pollset_set* grpc_pollset_set_create(void) { return NULL; } void grpc_pollset_set_destroy(grpc_pollset_set* pollset_set) {} |