util, gen, proxy: Fix Windows cross-build issues

Author: Sjors

include/mp/util.h

@@ -23,10 +23,6 @@
 #include <variant>
 #include <vector>
 
-#ifdef WIN32
-#include <winsock2.h>
-#endif
-
 namespace mp {
 
 //! Generic utility functions used by capnp code.
@@ -261,7 +257,7 @@ using Stream = kj::Own<kj::AsyncIoStream>;
 #ifdef WIN32
 using ProcessId = uintptr_t;
 using SocketId = uintptr_t;
-constexpr SocketId SocketError{INVALID_SOCKET};
+constexpr SocketId SocketError{static_cast<SocketId>(-1)};
 #else
 using ProcessId = int;
 using SocketId = int;

src/mp/gen.cpp

@@ -78,13 +78,13 @@ static bool GetAnnotationInt32(const Reader& reader, uint64_t id, int32_t* resul
     return false;
 }
 
-static void ForEachMethod(const capnp::InterfaceSchema& interface, const std::function<void(const capnp::InterfaceSchema& interface, const capnp::InterfaceSchema::Method)>& callback) // NOLINT(misc-no-recursion)
+static void ForEachMethod(const capnp::InterfaceSchema& schema, const std::function<void(const capnp::InterfaceSchema& schema, const capnp::InterfaceSchema::Method)>& callback) // NOLINT(misc-no-recursion)
 {
-    for (const auto super : interface.getSuperclasses()) {
+    for (const auto super : schema.getSuperclasses()) {
         ForEachMethod(super, callback);
     }
-    for (const auto method : interface.getMethods()) {
-        callback(interface, method);
+    for (const auto method : schema.getMethods()) {
+        callback(schema, method);
     }
 }
 
@@ -391,7 +391,7 @@ static void Generate(kj::StringPtr src_prefix,
         }
 
         if (proxied_class_type.size() && node.getProto().isInterface()) {
-            const auto& interface = node.asInterface();
+            const auto& node_interface = node.asInterface();
 
             std::ostringstream client;
             client << "template<>\nstruct ProxyClient<" << message_namespace << "::" << node_name << "> final : ";
@@ -413,7 +413,7 @@ static void Generate(kj::StringPtr src_prefix,
             const std::ostringstream client_destroy;
 
             int method_ordinal = 0;
-            ForEachMethod(interface, [&] (const capnp::InterfaceSchema& method_interface, const capnp::InterfaceSchema::Method& method) {
+            ForEachMethod(node_interface, [&] (const capnp::InterfaceSchema& method_interface, const capnp::InterfaceSchema::Method& method) {
                 const kj::StringPtr method_name = method.getProto().getName();
                 kj::StringPtr proxied_method_name = method_name;
                 GetAnnotationText(method.getProto(), NAME_ANNOTATION_ID, &proxied_method_name);
@@ -503,7 +503,7 @@ static void Generate(kj::StringPtr src_prefix,
                     }
                 }
 
-                if (!is_construct && !is_destroy && (&method_interface == &interface)) {
+                if (!is_construct && !is_destroy && (&method_interface == &node_interface)) {
                     methods << "template<>\n";
                     methods << "struct ProxyMethod<" << method_prefix << "Params>\n";
                     methods << "{\n";

src/mp/proxy.cpp

@@ -36,6 +36,13 @@
 #include <tuple>
 #include <utility>
 
+#ifdef WIN32
+#include <winsock2.h>
+#ifdef ERROR
+#undef ERROR
+#endif
+#endif
+
 namespace mp {
 
 thread_local ThreadContext g_thread_context; // NOLINT(bitcoin-nontrivial-threadlocal)

src/mp/util.cpp

@@ -23,8 +23,8 @@
 
 #ifdef WIN32
 #include <atomic>
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #else
 #include <fcntl.h>
 #include <sys/resource.h>