Merge branch 'we-dont-need-no-backup' of github.com:ctiller/grpc into we-dont-need-no-backup

10 years ago · ef8bdbf4e2
parent 4671122995 4cfef38965
commit ef8bdbf4e2
2 changed files with 4 additions and 2 deletions
--- 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 */
--- 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