[Build-System, ldns] config.h change to not define inline under Windows to avoid...

* [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>

diff --git a/libs/win32/ldns/ldns-lib/config.h b/libs/win32/ldns/ldns-lib/config.h
index 58463456b3c5a9f944dde2981fd0df574d28e8bd..fb29bc2c7c37ddfa307bae4372bbdad45c2749b4 100644 (file)
--- 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 445fe9a2b94965fd5002617d2d5c60e472adcaca..0036e1f278c47f7a0122d2f9d83e5e972a48ba24 100644 (file)
--- a/w32/download_LDNS.props
+++ b/w32/download_LDNS.props
@@ -29,7 +29,7 @@
 
   <Target Name="LDNSDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <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"
            outputfolder=""
            outputfilename=""