Fixes

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 */

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>

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;