- 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 80562a9ad25e28658f7dea4c274e142902f4bef3..ffde9240bd8f5e0ef982bc74fba4760b4e3db6a4 100644 (file)
--- 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 c816b8fce7e7ae12727e68f5d7e0708b0efbc7ef..241f027e14de327842ac86b844eee6c49a868099 100644 (file)
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 f82fded051ce46dcf3d4db09ec34ee36fb540042..272eb7a8e273cf1cfa1b3384cd1052853475863e 100644 (file)
--- 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);