From 930b4f0632b2bf63409cb46fc25406ada274e8ad Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <torsten@t3r.de>
Date: Tue, 3 May 2016 09:43:56 +0200
Subject: [PATCH] udns: fix self baked inet_pton
---
3rdparty/udns/CMakeLists.txt | 35 +++++++++++++++++------------------
3rdparty/udns/udns_XtoX.c | 4 ++--
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/3rdparty/udns/CMakeLists.txt b/3rdparty/udns/CMakeLists.txt
index e4ca6d2f..e4f14cbf 100644
--- a/3rdparty/udns/CMakeLists.txt
+++ b/3rdparty/udns/CMakeLists.txt
@@ -12,7 +12,6 @@ CHECK_SYMBOL_EXISTS(AF_INET6 "netinet/in.h" HAVE_IPv6)
# somehow it is not, if somebody know a better way to define WINDOWS, please fix
check_include_file(windows.h WINDOWS)
-
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
include_directories(${CMAKE_BINARY_DIR})
@@ -20,23 +19,23 @@ set(HEADERS
)
set(SOURCES
- udns_resolver.c
- udns_dn.c
- udns_dntosp.c
- udns_parse.c
- udns_resolver.c
- udns_init.c
- udns_misc.c
- udns_XtoX.c
- udns_rr_a.c
- udns_rr_ptr.c
- udns_rr_mx.c
- udns_rr_txt.c
- udns_bl.c
- udns_rr_srv.c
- udns_rr_naptr.c
- udns_codes.c
- udns_jran.c
+ udns_resolver.c
+ udns_dn.c
+ udns_dntosp.c
+ udns_parse.c
+ udns_resolver.c
+ udns_init.c
+ udns_misc.c
+ udns_rr_a.c
+ udns_rr_ptr.c
+ udns_rr_mx.c
+ udns_rr_txt.c
+ udns_bl.c
+ udns_rr_srv.c
+ udns_rr_naptr.c
+ udns_codes.c
+ udns_jran.c
+ udns_XtoX.c
)
simgear_component(udns 3rdparty/udns "${SOURCES}" "${HEADERS}")
diff --git a/3rdparty/udns/udns_XtoX.c b/3rdparty/udns/udns_XtoX.c
index 60e3fdfa..d68b6cec 100644
--- a/3rdparty/udns/udns_XtoX.c
+++ b/3rdparty/udns/udns_XtoX.c
@@ -43,8 +43,8 @@ int dns_pton(int af, const char *src, void *dst) {
}
#else
-
-#define inet_XtoX_prefix udns_
+#define inet_XtoX_no_ntop
+#define inet_XtoX_prefix dns_
#include "inet_XtoX.c"
#endif
--
2.39.5