diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-11-10 18:24:08 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-11-10 18:24:08 -0800 |
| commit | 2e01234d1ca35f65c70f06dd164e69c03132f97c (patch) | |
| tree | 8b2f00e69e0674426171ae88db56316def59a97f /src/core/lib/security/transport/secure_endpoint.c | |
| parent | aaefa958d796e8f9ec1fe48df61ca0fd9425be48 (diff) | |
Fix sanity, uv, and windows builds
Diffstat (limited to 'src/core/lib/security/transport/secure_endpoint.c')
| -rw-r--r-- | src/core/lib/security/transport/secure_endpoint.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/lib/security/transport/secure_endpoint.c b/src/core/lib/security/transport/secure_endpoint.c index 2d32fae8a1..1b278410e8 100644 --- a/src/core/lib/security/transport/secure_endpoint.c +++ b/src/core/lib/security/transport/secure_endpoint.c @@ -31,15 +31,20 @@ * */ -#include "src/core/lib/security/transport/secure_endpoint.h" +/* With the addition of a libuv endpoint, sockaddr.h now includes uv.h when + using that endpoint. Because of various transitive includes in uv.h, + including windows.h on Windows, uv.h must be included before other system + headers. Therefore, sockaddr.h must always be included first */ +#include "src/core/lib/iomgr/sockaddr.h" + #include <grpc/slice.h> #include <grpc/slice_buffer.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/sync.h> #include "src/core/lib/debug/trace.h" -#include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/profiling/timers.h" +#include "src/core/lib/security/transport/secure_endpoint.h" #include "src/core/lib/security/transport/tsi_error.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/support/string.h" |