diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-11-27 14:35:34 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-11-27 14:35:34 -0800 |
| commit | 9898212a4181fee4d9967cfbf42576b4a7f7e529 (patch) | |
| tree | da311844d93891c031b279024c0b0f3d7fe0889a /src/core/lib/iomgr/pollset_windows.h | |
| parent | 739ff08a7f4686306ef8d5b72c2a89b12305e275 (diff) | |
| parent | fbe8ff657ccb742daedae11a1029f5628de07ce7 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-objc-void-func
Diffstat (limited to 'src/core/lib/iomgr/pollset_windows.h')
| -rw-r--r-- | src/core/lib/iomgr/pollset_windows.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/pollset_windows.h b/src/core/lib/iomgr/pollset_windows.h index 2479b25286..f6da9da601 100644 --- a/src/core/lib/iomgr/pollset_windows.h +++ b/src/core/lib/iomgr/pollset_windows.h @@ -21,6 +21,9 @@ #include <grpc/support/sync.h> +#include "src/core/lib/iomgr/port.h" + +#ifdef GRPC_WINSOCK_SOCKET #include "src/core/lib/iomgr/socket_windows.h" #ifdef __cplusplus @@ -39,8 +42,8 @@ typedef enum { } grpc_pollset_worker_link_type; typedef struct grpc_pollset_worker_link { - struct grpc_pollset_worker *next; - struct grpc_pollset_worker *prev; + struct grpc_pollset_worker* next; + struct grpc_pollset_worker* prev; } grpc_pollset_worker_link; struct grpc_pollset; @@ -49,7 +52,7 @@ typedef struct grpc_pollset grpc_pollset; typedef struct grpc_pollset_worker { gpr_cv cv; int kicked; - struct grpc_pollset *pollset; + struct grpc_pollset* pollset; grpc_pollset_worker_link links[GRPC_POLLSET_WORKER_LINK_TYPES]; } grpc_pollset_worker; @@ -58,7 +61,7 @@ struct grpc_pollset { int kicked_without_pollers; int is_iocp_worker; grpc_pollset_worker root_worker; - grpc_closure *on_shutdown; + grpc_closure* on_shutdown; }; void grpc_pollset_global_init(void); @@ -68,4 +71,6 @@ void grpc_pollset_global_shutdown(void); } #endif +#endif + #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_WINDOWS_H */ |