cory/tildefriends
4
5
Fork 1
Code Issues 31 Pull Requests 1 Actions Releases 24 Wiki Activity

Fix some builds and make the windows build actually succeed at resolving what I want.
Some checks failed
Build Tilde Friends / Build-All (push) Failing after 4m13s
Details

Browse Source
This commit is contained in:
Cory McWilliams 2024-08-07 22:25:38 -04:00
parent 8d277f029d
commit f621feb843
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
deps/c-ares_config/ares_build.h vendored
View File

@ -5,9 +5,6 @@
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
*/ */
#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
#define CARES_STATICLIB #define CARES_STATICLIB
#ifdef CARES_HAVE_SYS_TYPES_H #ifdef CARES_HAVE_SYS_TYPES_H
@ -22,16 +19,19 @@
# include <sys/select.h> # include <sys/select.h>
#endif #endif
#ifdef CARES_HAVE_WINSOCK2_H #if defined(_WIN32)
# include <winsock2.h> #undef HAVE_REGISTERWAITFORSINGLEOBJECT
#endif #define CARES_HAVE_WINSOCK2_H
#define CARES_HAVE_WINDOWS_H
#ifdef CARES_HAVE_WS2TCPIP_H #define CARES_HAVE_WS2TCPIP_H
# include <ws2tcpip.h> #include <winsock2.h>
#endif #include <ws2tcpip.h>
#include <windows.h>
#ifdef CARES_HAVE_WINDOWS_H #define CARES_TYPEOF_ARES_SOCKLEN_T int
# include <windows.h> #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 #endif
#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(_WIN32) #if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(_WIN32)

3
src/ssb.c
View File

@ -2925,7 +2925,8 @@ static void _tf_ssb_update_seeds_work(tf_ssb_t* ssb, void* user_data)
{ {
ares_channel channel; ares_channel channel;
struct ares_options options = { .evsys = ARES_EVSYS_DEFAULT }; 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) 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)
{ {