summaryrefslogtreecommitdiffstats
path: root/contrib/unbound/daemon/unbound.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-09-15 00:36:18 +0000
committerdes <des@FreeBSD.org>2013-09-15 00:36:18 +0000
commita4b7c5a2b891b1626cbc7f0dd45a198e1f5f037f (patch)
treedb350d281e6140731c10d0c9e2991b25cb238d39 /contrib/unbound/daemon/unbound.c
parentaafb05a3bcadf34af0465fcf05f3fc918053ed4f (diff)
downloadFreeBSD-src-a4b7c5a2b891b1626cbc7f0dd45a198e1f5f037f.zip
FreeBSD-src-a4b7c5a2b891b1626cbc7f0dd45a198e1f5f037f.tar.gz
Numerous fixes to make Unbound compile cleanly:
- cast through void * to silence alignment warnings (presumably false positives resulting from poor API design) - constify a few function arguments - move prototypes for callbacks into a common header - now that the prototypes are in scope, fix instances of function definitions that don't match the prototype or what the caller actually passes - hide a conditionally unused global variable behind the same #ifdef that controls its use Approved by: re (blanket)
Diffstat (limited to 'contrib/unbound/daemon/unbound.c')
-rw-r--r--contrib/unbound/daemon/unbound.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/unbound/daemon/unbound.c b/contrib/unbound/daemon/unbound.c
index cd08c9c..4ad6ffd 100644
--- a/contrib/unbound/daemon/unbound.c
+++ b/contrib/unbound/daemon/unbound.c
@@ -53,6 +53,7 @@
#include "services/listen_dnsport.h"
#include "services/cache/rrset.h"
#include "services/cache/infra.h"
+#include "util/fptr_wlist.h"
#include "util/data/msgreply.h"
#include "util/module.h"
#include "util/net_help.h"
@@ -92,8 +93,10 @@
# include "nss.h"
#endif
+#ifdef HAVE_SBRK
/** global debug value to keep track of heap memory allocation */
void* unbound_start_brk = 0;
+#endif
#if !defined(HAVE_EVENT_BASE_GET_METHOD) && (defined(HAVE_EV_LOOP) || defined(HAVE_EV_DEFAULT_LOOP))
static const char* ev_backend2str(int b)
OpenPOWER on IntegriCloud