From 534ce4eb934c02c2f81c61be59964d93990bf6b8 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 21 Mar 2016 14:41:29 -0700
Subject: [PATCH] Fixes
---
src/core/iomgr/sockaddr_win32.h | 4 +++-
src/core/iomgr/socket_windows.c | 4 +++-
src/core/support/stack_lockfree.c | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/core/iomgr/sockaddr_win32.h b/src/core/iomgr/sockaddr_win32.h
index bdec72c761..ef306e3cc3 100644
--- a/src/core/iomgr/sockaddr_win32.h
+++ b/src/core/iomgr/sockaddr_win32.h
@@ -34,8 +34,10 @@
#ifndef GRPC_CORE_IOMGR_SOCKADDR_WIN32_H
#define GRPC_CORE_IOMGR_SOCKADDR_WIN32_H
-#include <mswsock.h>
#include <winsock2.h>
#include <ws2tcpip.h>
+// must be included after the above
+#include <mswsock.h>
+
#endif /* GRPC_CORE_IOMGR_SOCKADDR_WIN32_H */
diff --git a/src/core/iomgr/socket_windows.c b/src/core/iomgr/socket_windows.c
index b27bb1cfb0..c1f419e273 100644
--- a/src/core/iomgr/socket_windows.c
+++ b/src/core/iomgr/socket_windows.c
@@ -35,9 +35,11 @@
#ifdef GPR_WINSOCK_SOCKET
-#include <mswsock.h>
#include <winsock2.h>
+// must be included after winsock2.h
+#include <mswsock.h>
+
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/log_win32.h>
diff --git a/src/core/support/stack_lockfree.c b/src/core/support/stack_lockfree.c
index 51d1c42eb4..8e0bbfaee8 100644
--- a/src/core/support/stack_lockfree.c
+++ b/src/core/support/stack_lockfree.c
@@ -64,10 +64,10 @@ typedef union lockfree_node {
struct lockfree_node_contents contents;
} lockfree_node;
-#define ENTRY_ALIGNMENT_BITS 3 /* make sure that entries aligned to 8-bytes */
-#define INVALID_ENTRY_INDEX \
- ((1 << 16) - 1) /* reserve this entry as invalid \
- */
+/* make sure that entries aligned to 8-bytes */
+#define ENTRY_ALIGNMENT_BITS 3
+/* reserve this entry as invalid */
+#define INVALID_ENTRY_INDEX ((1 << 16) - 1)
struct gpr_stack_lockfree {
lockfree_node *entries;
--
GitLab