diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/asio/asio/impl/error_code.ipp | 2 | ||||
| -rw-r--r-- | src/lib/dns/rrtype-placeholder.h | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 48a79d262c..65ca5f9ec9 100644 --- a/configure.ac +++ b/configure.ac @@ -266,7 +266,7 @@ AC_SUBST(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG) # gcc specific settings: if test "X$GXX" = "Xyes"; then -B10_CXXFLAGS="-Wall -Wextra -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare" +B10_CXXFLAGS="-Wall -Wextra -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare -Wno-missing-braces" case "$host" in *-solaris*) MULTITHREADING_FLAG=-pthreads diff --git a/ext/asio/asio/impl/error_code.ipp b/ext/asio/asio/impl/error_code.ipp index ed37a17dd3..b0566ed6c9 100644 --- a/ext/asio/asio/impl/error_code.ipp +++ b/ext/asio/asio/impl/error_code.ipp @@ -11,6 +11,8 @@ #ifndef ASIO_IMPL_ERROR_CODE_IPP #define ASIO_IMPL_ERROR_CODE_IPP +#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 1cb028c177..f298acd32e 100644 --- a/src/lib/dns/rrtype-placeholder.h +++ b/src/lib/dns/rrtype-placeholder.h @@ -22,6 +22,10 @@ #include <exceptions/exceptions.h> +#if defined(__sun) && defined(DS) +# undef DS +#endif + namespace isc { namespace util { class InputBuffer; |