Parcourir la source

[trac1155] changes to make build work in Solaris 10 x86

Dima Volodin il y a 13 ans
Parent
commit
7b55eb0248
3 fichiers modifiés avec 7 ajouts et 1 suppressions
  1. 1 1
      configure.ac
  2. 2 0
      ext/asio/asio/impl/error_code.ipp
  3. 4 0
      src/lib/dns/rrtype-placeholder.h

+ 1 - 1
configure.ac

@@ -266,7 +266,7 @@ AC_SUBST(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 
 
 # gcc specific settings:
 # gcc specific settings:
 if test "X$GXX" = "Xyes"; then
 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
 case "$host" in
 *-solaris*)
 *-solaris*)
 	MULTITHREADING_FLAG=-pthreads
 	MULTITHREADING_FLAG=-pthreads

+ 2 - 0
ext/asio/asio/impl/error_code.ipp

@@ -11,6 +11,8 @@
 #ifndef ASIO_IMPL_ERROR_CODE_IPP
 #ifndef ASIO_IMPL_ERROR_CODE_IPP
 #define ASIO_IMPL_ERROR_CODE_IPP
 #define ASIO_IMPL_ERROR_CODE_IPP
 
 
+#include <cstring>
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)

+ 4 - 0
src/lib/dns/rrtype-placeholder.h

@@ -22,6 +22,10 @@
 
 
 #include <exceptions/exceptions.h>
 #include <exceptions/exceptions.h>
 
 
+#if defined(__sun) && defined(DS)
+# undef DS
+#endif
+
 namespace isc {
 namespace isc {
 namespace util {
 namespace util {
 class InputBuffer;
 class InputBuffer;