diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/iomgr/iocp_windows.h | 1 | ||||
-rw-r--r-- | src/core/iomgr/pollset_windows.h | 1 | ||||
-rw-r--r-- | src/core/iomgr/sockaddr_win32.h | 2 | ||||
-rw-r--r-- | src/core/iomgr/socket_windows.h | 3 | ||||
-rw-r--r-- | src/core/support/cpu_windows.c | 1 | ||||
-rw-r--r-- | src/core/support/string_win32.c | 1 | ||||
-rw-r--r-- | src/core/support/string_win32.h | 2 | ||||
-rw-r--r-- | src/core/support/sync_win32.c | 3 | ||||
-rw-r--r-- | src/core/support/thd_win32.c | 1 | ||||
-rw-r--r-- | src/core/support/time_win32.c | 1 |
10 files changed, 3 insertions, 13 deletions
diff --git a/src/core/iomgr/iocp_windows.h b/src/core/iomgr/iocp_windows.h index 4503fdd55e..9df6476917 100644 --- a/src/core/iomgr/iocp_windows.h +++ b/src/core/iomgr/iocp_windows.h @@ -34,7 +34,6 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_IOCP_WINDOWS_H #define GRPC_INTERNAL_CORE_IOMGR_IOCP_WINDOWS_H -#include <windows.h> #include <grpc/support/sync.h> #include "src/core/iomgr/socket_windows.h" 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" diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h index c0385ea614..be55db805a 100644 --- a/src/core/iomgr/sockaddr_win32.h +++ b/src/core/iomgr/sockaddr_win32.h @@ -34,8 +34,8 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_SOCKADDR_WIN32_H #define GRPC_INTERNAL_CORE_IOMGR_SOCKADDR_WIN32_H -#include <ws2tcpip.h> #include <winsock2.h> +#include <ws2tcpip.h> #include <mswsock.h> #ifdef __MINGW32__ diff --git a/src/core/iomgr/socket_windows.h b/src/core/iomgr/socket_windows.h index 7080919af0..f7b969eb5e 100644 --- a/src/core/iomgr/socket_windows.h +++ b/src/core/iomgr/socket_windows.h @@ -34,7 +34,8 @@ #ifndef GRPC_INTERNAL_CORE_IOMGR_SOCKET_WINDOWS_H #define GRPC_INTERNAL_CORE_IOMGR_SOCKET_WINDOWS_H -#include <windows.h> +#include <grpc/support/port_platform.h> +#include <WinSock2.h> #include <grpc/support/sync.h> #include <grpc/support/atm.h> diff --git a/src/core/support/cpu_windows.c b/src/core/support/cpu_windows.c index 107a7b85f0..ce32eb0a9d 100644 --- a/src/core/support/cpu_windows.c +++ b/src/core/support/cpu_windows.c @@ -34,7 +34,6 @@ #include <grpc/support/port_platform.h> #ifdef GPR_WIN32 -#include <windows.h> #include <grpc/support/log.h> unsigned gpr_cpu_num_cores(void) { diff --git a/src/core/support/string_win32.c b/src/core/support/string_win32.c index 6d1d6337a9..27b9f3637a 100644 --- a/src/core/support/string_win32.c +++ b/src/core/support/string_win32.c @@ -37,7 +37,6 @@ #ifdef GPR_WIN32 -#include <windows.h> #include <stdio.h> #include <stdarg.h> #include <string.h> diff --git a/src/core/support/string_win32.h b/src/core/support/string_win32.h index 0bc3247d9d..1260aa55c1 100644 --- a/src/core/support/string_win32.h +++ b/src/core/support/string_win32.h @@ -38,8 +38,6 @@ #ifdef GPR_WIN32 -#include <windows.h> - /* These allocate new strings using gpr_malloc to convert from and to utf-8. */ LPTSTR gpr_char_to_tchar(LPCSTR input); LPSTR gpr_tchar_to_char(LPCTSTR input); diff --git a/src/core/support/sync_win32.c b/src/core/support/sync_win32.c index cc31d9b052..72f39f8d46 100644 --- a/src/core/support/sync_win32.c +++ b/src/core/support/sync_win32.c @@ -37,9 +37,6 @@ #ifdef GPR_WIN32 -#undef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#include <windows.h> #include <grpc/support/log.h> #include <grpc/support/sync.h> #include <grpc/support/time.h> diff --git a/src/core/support/thd_win32.c b/src/core/support/thd_win32.c index 3cc798293a..4fa3907444 100644 --- a/src/core/support/thd_win32.c +++ b/src/core/support/thd_win32.c @@ -37,7 +37,6 @@ #ifdef GPR_WIN32 -#include <windows.h> #include <string.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> diff --git a/src/core/support/time_win32.c b/src/core/support/time_win32.c index f4443b5c2d..9db267c01b 100644 --- a/src/core/support/time_win32.c +++ b/src/core/support/time_win32.c @@ -39,7 +39,6 @@ #include <grpc/support/time.h> #include <sys/timeb.h> -#include <windows.h> gpr_timespec gpr_now(void) { gpr_timespec now_tv; |