diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:52:53 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:52:53 -0700 |
| commit | 547fed4e8b0b8e2390498b748ee49a033e5039ae (patch) | |
| tree | f8ed878185575bab8eccb606be76b0384f62cb28 /src/core/iomgr/pollset_windows.h | |
| parent | cf531785495330c86ce2531d2ec5dbff9da680c6 (diff) | |
| parent | 772187cdf0ff9dfafd2e693474c51eeddfe4c800 (diff) | |
Merge github.com:grpc/grpc into footprints-on-the-sands-of-time
Conflicts:
src/core/channel/client_setup.c
src/core/surface/init.c
Diffstat (limited to 'src/core/iomgr/pollset_windows.h')
| -rw-r--r-- | src/core/iomgr/pollset_windows.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/iomgr/pollset_windows.h b/src/core/iomgr/pollset_windows.h index 57a2907926..c9b8d3f374 100644 --- a/src/core/iomgr/pollset_windows.h +++ b/src/core/iomgr/pollset_windows.h @@ -34,7 +34,6 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H #define GRPC_INTERNAL_CORE_IOMGR_POLLSET_WINDOWS_H -#include <windows.h> #include <grpc/support/sync.h> #include "src/core/iomgr/socket_windows.h" |