diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-03-30 05:10:03 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-03-30 05:10:03 +0200 |
| commit | e33f93620a225e28dc7d76fe478f83ea746fa0ff (patch) | |
| tree | 664078be1c796444cdb7ea42eaef6ecf826cf28f /src/core/lib | |
| parent | 508e89f4c9e80b62836391e7bacab7aa62df58ca (diff) | |
| parent | ed02571552dff69e80f98bd644dcabc4d6f6388b (diff) | |
Merge branch 'release-0_13' into manual-upmerge
Diffstat (limited to 'src/core/lib')
| -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) {} |