From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 2 Jun 2010 07:36:11 +0000 (+0000)
Subject:        - Fix compile warning if compiled without threads.
X-Git-Tag: release-1.4.5rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d71f58837b953f0d39fe941ff74a0b3f6ed2d11;p=thirdparty%2Funbound.git

   - Fix compile warning if compiled without threads.
       - updated ldns-tarball with current ldns svn (pre 1.6.5).


git-svn-id: file:///svn/unbound/trunk@2130 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index 80562a9ad..ffde9240b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+2 June 2010: Wouter
+	- Fix compile warning if compiled without threads.
+	- updated ldns-tarball with current ldns svn (pre 1.6.5).
+
 1 June 2010: Wouter
 	- Ignore Z flag in incoming messages too.
 	- Fix storage of negative parent glue if that last resort fails.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index c816b8fce..241f027e1 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ
diff --git a/util/locks.c b/util/locks.c
index f82fded05..272eb7a8e 100644
--- a/util/locks.c
+++ b/util/locks.c
@@ -51,7 +51,9 @@ void
 ub_thread_blocksigs()
 {
 #if defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS) || defined(HAVE_SIGPROCMASK)
+#  if defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS)
 	int err;
+#  endif
 	sigset_t sigset;
 	sigfillset(&sigset);
 #ifdef HAVE_PTHREAD
@@ -74,7 +76,9 @@ ub_thread_blocksigs()
 void ub_thread_sig_unblock(int sig)
 {
 #if defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS) || defined(HAVE_SIGPROCMASK)
+#  if defined(HAVE_PTHREAD) || defined(HAVE_SOLARIS_THREADS)
 	int err;
+#  endif
 	sigset_t sigset;
 	sigemptyset(&sigset);
 	sigaddset(&sigset, sig);