From a6e219062dd30a0c6b9b53b3dc0864a83924a8d9 Mon Sep 17 00:00:00 2001 From: Visytel <59720603+Visytel@users.noreply.github.com> Date: Mon, 8 Jan 2024 20:00:28 +1100 Subject: [PATCH] [Build-System, ldns] config.h change to not define inline under Windows to avoid clash with Windows winsock2.h inline usage. Use updated ldns tarball on Windows. * [ldns] config.h change to not define inline under Windows to avoid clash with Windows winsock2.h inline usage * [Build-System] Use updated ldns tarball on Windows. --------- Co-authored-by: Andrey Volk --- libs/win32/ldns/ldns-lib/config.h | 4 +++- w32/download_LDNS.props | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/win32/ldns/ldns-lib/config.h b/libs/win32/ldns/ldns-lib/config.h index 58463456b3..fb29bc2c7c 100644 --- a/libs/win32/ldns/ldns-lib/config.h +++ b/libs/win32/ldns/ldns-lib/config.h @@ -260,7 +260,9 @@ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ #ifndef __cplusplus -#define inline +#ifndef _WIN32 +#define inline /* Do not define inline for Windows to avoid warnings/errors with winsock2.h usage of inline within the latest Windows SDKs */ +#endif #endif #if _MSC_VER >= 1900 diff --git a/w32/download_LDNS.props b/w32/download_LDNS.props index 445fe9a2b9..0036e1f278 100644 --- a/w32/download_LDNS.props +++ b/w32/download_LDNS.props @@ -29,7 +29,7 @@