diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-09 22:59:45 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-09 22:59:45 -0700 |
| commit | ef8bdbf4e2a8289fc8bbc51af5ca2465f9ec27c2 (patch) | |
| tree | e1a2abfe77a8959dfa668a514c43ab9ce59774ae /src/core | |
| parent | 4671122995920325fde9bc9298e85f088f0cc3c4 (diff) | |
| parent | 4cfef389650fc58e2bb3742e7336d4849fc9db93 (diff) | |
Merge branch 'we-dont-need-no-backup' of github.com:ctiller/grpc into we-dont-need-no-backup
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/pollset_set_windows.c | 5 | ||||
| -rw-r--r-- | src/core/iomgr/pollset_windows.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/core/iomgr/pollset_set_windows.c b/src/core/iomgr/pollset_set_windows.c index d295c64b5e..6a21925908 100644 --- a/src/core/iomgr/pollset_set_windows.c +++ b/src/core/iomgr/pollset_set_windows.c @@ -42,6 +42,9 @@ void grpc_pollset_set_init(grpc_pollset_set *pollset_set) {} void grpc_pollset_set_destroy(grpc_pollset_set *pollset_set) {} void grpc_pollset_set_add_pollset(grpc_pollset_set *pollset_set, - grpc_pollset *pollset) {} + grpc_pollset *pollset) {} + +void grpc_pollset_set_del_pollset(grpc_pollset_set *pollset_set, + grpc_pollset *pollset) {} #endif /* GPR_WINSOCK_SOCKET */ diff --git a/src/core/iomgr/pollset_windows.h b/src/core/iomgr/pollset_windows.h index 7ec960450d..cbbd9efdd1 100644 --- a/src/core/iomgr/pollset_windows.h +++ b/src/core/iomgr/pollset_windows.h @@ -37,7 +37,6 @@ #include <windows.h> #include <grpc/support/sync.h> -#include "src/core/iomgr/pollset_kick.h" #include "src/core/iomgr/socket_windows.h" /* There isn't really any such thing as a pollset under Windows, due to the |