[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 <andywolk@gmail.com>
This commit is contained in:
Visytel 2024-01-08 20:00:28 +11:00 committed by GitHub
parent 0cea9811cd
commit a6e219062d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -260,7 +260,9 @@
/* Define to `__inline__' or `__inline' if that's what the C compiler /* 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. */ calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus #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 #endif
#if _MSC_VER >= 1900 #if _MSC_VER >= 1900

View File

@ -29,7 +29,7 @@
<Target Name="LDNSDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za"> <Target Name="LDNSDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
<DownloadPackageTask <DownloadPackageTask
package="http://files.freeswitch.org/downloads/libs/ldns-1.6.9-1-win.tar.gz" package="http://files.freeswitch.org/downloads/libs/ldns-1.6.9-2-win.tar.gz"
expectfileordirectory="$(BaseDir)libs\ldns\configure.ac" expectfileordirectory="$(BaseDir)libs\ldns\configure.ac"
outputfolder="" outputfolder=""
outputfilename="" outputfilename=""