From f621feb8439c2d29abd7b559a36bc89300e62d71 Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Wed, 7 Aug 2024 22:25:38 -0400
Subject: [PATCH] Fix some builds and make the windows build actually succeed
 at resolving what I want.

---
 deps/c-ares_config/ares_build.h | 26 +++++++++++++-------------
 src/ssb.c                       |  3 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/deps/c-ares_config/ares_build.h b/deps/c-ares_config/ares_build.h
index f32386c7..bd6f6b79 100644
--- a/deps/c-ares_config/ares_build.h
+++ b/deps/c-ares_config/ares_build.h
@@ -5,9 +5,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
-
 #define CARES_STATICLIB
 
 #ifdef CARES_HAVE_SYS_TYPES_H
@@ -22,16 +19,19 @@
 #  include <sys/select.h>
 #endif
 
-#ifdef CARES_HAVE_WINSOCK2_H
-#  include <winsock2.h>
-#endif
-
-#ifdef CARES_HAVE_WS2TCPIP_H
-#  include <ws2tcpip.h>
-#endif
-
-#ifdef CARES_HAVE_WINDOWS_H
-#  include <windows.h>
+#if defined(_WIN32)
+#undef HAVE_REGISTERWAITFORSINGLEOBJECT
+#define CARES_HAVE_WINSOCK2_H
+#define CARES_HAVE_WINDOWS_H
+#define CARES_HAVE_WS2TCPIP_H
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#define CARES_TYPEOF_ARES_SOCKLEN_T int
+#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
+#else
+#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
+#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
 #endif
 
 #if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(_WIN32)
diff --git a/src/ssb.c b/src/ssb.c
index ef5c42ee..2ac55fb4 100644
--- a/src/ssb.c
+++ b/src/ssb.c
@@ -2925,7 +2925,8 @@ static void _tf_ssb_update_seeds_work(tf_ssb_t* ssb, void* user_data)
 	{
 		ares_channel channel;
 		struct ares_options options = { .evsys = ARES_EVSYS_DEFAULT };
-		if (ares_init_options(&channel, &options, ARES_OPT_EVENT_THREAD) == ARES_SUCCESS)
+		int result = ares_init_options(&channel, &options, ARES_OPT_EVENT_THREAD);
+		if (result == ARES_SUCCESS)
 		{
 			if (ares_query_dnsrec(channel, ssb->seeds_host, ARES_CLASS_IN, ARES_REC_TYPE_TXT, _tf_ssb_update_seed_callback, user_data, NULL) == ARES_SUCCESS)
 			{