From 756e56a8c683906b1b50bba5675c996fb1295820 Mon Sep 17 00:00:00 2001
From: Jelte Jansen <jelte@isc.org>
Date: Mon, 14 Feb 2011 21:41:07 +0100
Subject: [PATCH] [master] fix sunstudio build and distcheck

forgot an EXTRA_DIST for the distcheck, and sunstudio needs unistd to be included before asio.hpp
---
 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 93a7498fb..68a41d62f 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 10e9ce0c9..98ca0320b 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 de9906992..6b0cd092a 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 69e662ed6..8d96da9f9 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 2172eea54..9f814b0c9 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 3928bc1e9..2bdfc6074 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 6dbb18226..a79381473 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 876433a5f..9a18d7611 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>
-- 
GitLab