From 8d42ff784d0da04fda44ef8395f35671bd5ec0b3 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Wed, 10 Aug 2016 10:47:32 -0600 Subject: res_resolver_unbound: Allow compilation with libunbound version < 1.5 libunbound at version 1.4.20 (which CentOS still uses) declared all of their string function parameters as as 'char *'. 1.4.21 changed them all to 'const char *'. Thankfully 1.4.21 also introduced the UNBOUND_VERSION_MAJOR define so configure now checks for that and sets HAVE_UNBOUND_CONST_PARAMS. res_resolver_unbound then checks that and casts away the 'const' if it's not set. Tested compile and testsuite on CentOS6 (1.4.20), Ubuntu14 (1.4.22) and Fedora24 (1.5.4). There are a few failing tests to be addressed though. ASTERISK-26283 #close Change-Id: Ib708b19b706c5d0ba7b7d5473e6df339d9ae4148 --- include/asterisk/autoconfig.h.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/asterisk/autoconfig.h.in') diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index b48257ec0..bdd93bb64 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1108,6 +1108,9 @@ /* Define to 1 if you have the unbound library. */ #undef HAVE_UNBOUND +/* Define if your system has UNBOUND_VERSION_MAJOR declared. */ +#undef HAVE_UNBOUND_CONST_PARAMS + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -- cgit v1.2.3