BIND 10 master, updated. 900a3c5828be90bfce2a7b8e2e6edc0d4509df6a Merge branch 'master' into trac1155

[BIND 10 source code commits]

The branch, master has been updated
       via  900a3c5828be90bfce2a7b8e2e6edc0d4509df6a (commit)
       via  af698f41e199e4942d818accb0cc0ad7589785e8 (commit)
       via  6300d968db6e857e199cf8e4701988bf2f9136a2 (commit)
       via  49d5415d994ab0807daeaacf5e30f9186ca72ff5 (commit)
       via  7b55eb02488353672fad7160148a40e581cb5c80 (commit)
      from  0711c996f017cabe220dd291500bb1b202f21e1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 900a3c5828be90bfce2a7b8e2e6edc0d4509df6a
Merge: af698f41e199e4942d818accb0cc0ad7589785e8 0711c996f017cabe220dd291500bb1b202f21e1f
Author: Dima Volodin <dvv at isc.org>
Date:   Mon Jul 25 08:08:13 2011 -0400

    Merge branch 'master' into trac1155

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                      |    2 ++
 ext/asio/asio/impl/error_code.ipp |    3 +++
 src/lib/dns/rrtype-placeholder.h  |    5 +++++
 3 files changed, 10 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 48a79d2..369f973 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,6 +270,8 @@ B10_CXXFLAGS="-Wall -Wextra -Wwrite-strings -Woverloaded-virtual -Wno-sign-compa
 case "$host" in
 *-solaris*)
 	MULTITHREADING_FLAG=-pthreads
+	# In Solaris, IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT need -Wno-missing-braces
+	B10_CXXFLAGS="$B10_CXXFLAGS -Wno-missing-braces"
 	;;
 *)
 	MULTITHREADING_FLAG=-pthread
diff --git a/ext/asio/asio/impl/error_code.ipp b/ext/asio/asio/impl/error_code.ipp
index ed37a17..218c09b 100644
--- a/ext/asio/asio/impl/error_code.ipp
+++ b/ext/asio/asio/impl/error_code.ipp
@@ -11,6 +11,9 @@
 #ifndef ASIO_IMPL_ERROR_CODE_IPP
 #define ASIO_IMPL_ERROR_CODE_IPP
 
+// strerror() needs <cstring>
+#include <cstring>
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/src/lib/dns/rrtype-placeholder.h b/src/lib/dns/rrtype-placeholder.h
index 1cb028c..dad1b2b 100644
--- a/src/lib/dns/rrtype-placeholder.h
+++ b/src/lib/dns/rrtype-placeholder.h
@@ -22,6 +22,11 @@
 
 #include <exceptions/exceptions.h>
 
+// Solaris x86 defines DS in <sys/regset.h>, which gets pulled in by Boost
+#if defined(__sun) && defined(DS)
+# undef DS
+#endif
+
 namespace isc {
 namespace util {
 class InputBuffer;