From 4ac2b8e585cbf7064f9bdde4eabaf8ff42801142 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 10 Nov 2017 14:14:17 -0800 Subject: Enable clang-tidy as a sanity check, fix up all known failures --- src/core/lib/iomgr/sockaddr_windows.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/core/lib/iomgr/sockaddr_windows.h') diff --git a/src/core/lib/iomgr/sockaddr_windows.h b/src/core/lib/iomgr/sockaddr_windows.h index cf0f6b914d..1e859006f0 100644 --- a/src/core/lib/iomgr/sockaddr_windows.h +++ b/src/core/lib/iomgr/sockaddr_windows.h @@ -19,10 +19,15 @@ #ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H #define GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H +#include "src/core/lib/iomgr/port.h" + +#ifdef GRPC_WINSOCK_SOCKET + #include #include // must be included after the above #include +#endif /* GRPC_WINSOCK_SOCKET */ #endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H */ -- cgit v1.2.3 From 8c12c5112a4ad71d8ef09315fac412bc575b52bc Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 10 Nov 2017 15:29:31 -0800 Subject: sanity fixes --- src/core/lib/iomgr/iocp_windows.h | 3 ++- src/core/lib/iomgr/pollset_windows.h | 3 ++- src/core/lib/iomgr/sockaddr_windows.h | 3 ++- src/core/lib/iomgr/socket_windows.h | 3 ++- src/core/lib/iomgr/tcp_windows.h | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/core/lib/iomgr/sockaddr_windows.h') diff --git a/src/core/lib/iomgr/iocp_windows.h b/src/core/lib/iomgr/iocp_windows.h index 3f3c8a18bc..d112c50538 100644 --- a/src/core/lib/iomgr/iocp_windows.h +++ b/src/core/lib/iomgr/iocp_windows.h @@ -49,5 +49,6 @@ void grpc_iocp_add_socket(grpc_winsocket*); } #endif -#endif /* GRPC_WINSOCK_SOCKET */ +#endif + #endif /* GRPC_CORE_LIB_IOMGR_IOCP_WINDOWS_H */ diff --git a/src/core/lib/iomgr/pollset_windows.h b/src/core/lib/iomgr/pollset_windows.h index 978976395d..f6da9da601 100644 --- a/src/core/lib/iomgr/pollset_windows.h +++ b/src/core/lib/iomgr/pollset_windows.h @@ -71,5 +71,6 @@ void grpc_pollset_global_shutdown(void); } #endif -#endif /* GRPC_WINSOCK_SOCKET */ +#endif + #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_WINDOWS_H */ diff --git a/src/core/lib/iomgr/sockaddr_windows.h b/src/core/lib/iomgr/sockaddr_windows.h index 1e859006f0..20e37c9fc4 100644 --- a/src/core/lib/iomgr/sockaddr_windows.h +++ b/src/core/lib/iomgr/sockaddr_windows.h @@ -29,5 +29,6 @@ // must be included after the above #include -#endif /* GRPC_WINSOCK_SOCKET */ +#endif + #endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_WINDOWS_H */ diff --git a/src/core/lib/iomgr/socket_windows.h b/src/core/lib/iomgr/socket_windows.h index d7938691ce..c3ad99d82f 100644 --- a/src/core/lib/iomgr/socket_windows.h +++ b/src/core/lib/iomgr/socket_windows.h @@ -118,5 +118,6 @@ void grpc_socket_become_ready(grpc_exec_ctx* exec_ctx, } #endif -#endif /* GRPC_WINSOCK_SOCKET */ +#endif + #endif /* GRPC_CORE_LIB_IOMGR_SOCKET_WINDOWS_H */ diff --git a/src/core/lib/iomgr/tcp_windows.h b/src/core/lib/iomgr/tcp_windows.h index 220b502ecd..9c7ccdf132 100644 --- a/src/core/lib/iomgr/tcp_windows.h +++ b/src/core/lib/iomgr/tcp_windows.h @@ -52,5 +52,6 @@ grpc_error* grpc_tcp_prepare_socket(SOCKET sock); } #endif -#endif /* GRPC_WINSOCK_SOCKET */ +#endif + #endif /* GRPC_CORE_LIB_IOMGR_TCP_WINDOWS_H */ -- cgit v1.2.3