BIND 10 master, updated. 756e56a8c683906b1b50bba5675c996fb1295820 [master] fix sunstudio build and distcheck
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Feb 14 20:41:56 UTC 2011
The branch, master has been updated
via 756e56a8c683906b1b50bba5675c996fb1295820 (commit)
from 0cc21b601f0ef1e907deaf3dbf02813ec2e0f493 (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 756e56a8c683906b1b50bba5675c996fb1295820
Author: Jelte Jansen <jelte at isc.org>
Date: Mon Feb 14 21:41:07 2011 +0100
[master] fix sunstudio build and distcheck
forgot an EXTRA_DIST for the distcheck, and sunstudio needs unistd to be included before asio.hpp
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 +
src/lib/asiolink/dns_service.cc | 7 ++++---
src/lib/asiolink/interval_timer.cc | 3 +++
src/lib/asiolink/io_service.cc | 4 +++-
src/lib/asiolink/recursive_query.cc | 5 ++++-
src/lib/asiolink/tcp_server.cc | 3 +++
src/lib/asiolink/udp_query.cc | 3 +++
src/lib/asiolink/udp_server.cc | 3 +++
8 files changed, 24 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 93a7498..68a41d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -282,3 +282,4 @@ EXTRA_DIST += ext/asio/asio/is_write_buffered.hpp
EXTRA_DIST += ext/asio/asio/buffered_read_stream_fwd.hpp
EXTRA_DIST += ext/asio/asio/socket_acceptor_service.hpp
EXTRA_DIST += ext/asio/asio.hpp
+EXTRA_DIST += ext/coroutine/coroutine.h
diff --git a/src/lib/asiolink/dns_service.cc b/src/lib/asiolink/dns_service.cc
index 10e9ce0..98ca032 100644
--- a/src/lib/asiolink/dns_service.cc
+++ b/src/lib/asiolink/dns_service.cc
@@ -14,11 +14,12 @@
#include <config.h>
-#include <asiolink/io_service.h>
-
-#include <asio/ip/address.hpp>
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
#include <asio.hpp>
+
+#include <asiolink/io_service.h>
#include <asiolink/tcp_server.h>
#include <asiolink/udp_server.h>
diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc
index de99069..6b0cd09 100644
--- a/src/lib/asiolink/interval_timer.cc
+++ b/src/lib/asiolink/interval_timer.cc
@@ -14,6 +14,9 @@
#include <config.h>
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
#include <asio.hpp>
#include <exceptions/exceptions.h>
diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc
index 69e662e..8d96da9 100644
--- a/src/lib/asiolink/io_service.cc
+++ b/src/lib/asiolink/io_service.cc
@@ -11,9 +11,11 @@
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-
#include <config.h>
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
#include <asio.hpp>
#include <asiolink/io_service.h>
diff --git a/src/lib/asiolink/recursive_query.cc b/src/lib/asiolink/recursive_query.cc
index 2172eea..9f814b0 100644
--- a/src/lib/asiolink/recursive_query.cc
+++ b/src/lib/asiolink/recursive_query.cc
@@ -14,7 +14,10 @@
#include <config.h>
-#include <asio/ip/address.hpp>
+#include <stdlib.h>
+
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
#include <asio.hpp>
diff --git a/src/lib/asiolink/tcp_server.cc b/src/lib/asiolink/tcp_server.cc
index 3928bc1..2bdfc60 100644
--- a/src/lib/asiolink/tcp_server.cc
+++ b/src/lib/asiolink/tcp_server.cc
@@ -16,6 +16,9 @@
#include <boost/shared_array.hpp>
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
#include <asio.hpp>
#include <log/dummylog.h>
diff --git a/src/lib/asiolink/udp_query.cc b/src/lib/asiolink/udp_query.cc
index 6dbb182..a793814 100644
--- a/src/lib/asiolink/udp_query.cc
+++ b/src/lib/asiolink/udp_query.cc
@@ -14,6 +14,9 @@
#include <config.h>
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
#include <asio.hpp>
#include <boost/bind.hpp>
diff --git a/src/lib/asiolink/udp_server.cc b/src/lib/asiolink/udp_server.cc
index 876433a..9a18d76 100644
--- a/src/lib/asiolink/udp_server.cc
+++ b/src/lib/asiolink/udp_server.cc
@@ -16,6 +16,9 @@
#include <boost/shared_array.hpp>
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
#include <asio.hpp>
#include <log/dummylog.h>
More information about the bind10-changes
mailing list