Parcourir la source

[master] fix sunstudio build and distcheck

forgot an EXTRA_DIST for the distcheck, and sunstudio needs unistd to be included before asio.hpp
Jelte Jansen il y a 14 ans
Parent
commit
756e56a8c6

+ 1 - 0
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/buffered_read_stream_fwd.hpp
 EXTRA_DIST += ext/asio/asio/socket_acceptor_service.hpp
 EXTRA_DIST += ext/asio/asio/socket_acceptor_service.hpp
 EXTRA_DIST += ext/asio/asio.hpp
 EXTRA_DIST += ext/asio/asio.hpp
+EXTRA_DIST += ext/coroutine/coroutine.h

+ 4 - 3
src/lib/asiolink/dns_service.cc

@@ -14,11 +14,12 @@
 
 
 #include <config.h>
 #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 <asio.hpp>
+
+#include <asiolink/io_service.h>
 #include <asiolink/tcp_server.h>
 #include <asiolink/tcp_server.h>
 #include <asiolink/udp_server.h>
 #include <asiolink/udp_server.h>
 
 

+ 3 - 0
src/lib/asiolink/interval_timer.cc

@@ -14,6 +14,9 @@
 
 
 #include <config.h>
 #include <config.h>
 
 
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
 #include <asio.hpp>
 #include <asio.hpp>
 
 
 #include <exceptions/exceptions.h>
 #include <exceptions/exceptions.h>

+ 3 - 1
src/lib/asiolink/io_service.cc

@@ -11,9 +11,11 @@
 // LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 // 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
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 // PERFORMANCE OF THIS SOFTWARE.
-
 #include <config.h>
 #include <config.h>
 
 
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
 #include <asio.hpp>
 #include <asio.hpp>
 
 
 #include <asiolink/io_service.h>
 #include <asiolink/io_service.h>

+ 4 - 1
src/lib/asiolink/recursive_query.cc

@@ -14,7 +14,10 @@
 
 
 #include <config.h>
 #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>
 #include <asio.hpp>
 
 

+ 3 - 0
src/lib/asiolink/tcp_server.cc

@@ -16,6 +16,9 @@
 
 
 #include <boost/shared_array.hpp>
 #include <boost/shared_array.hpp>
 
 
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
 #include <asio.hpp>
 #include <asio.hpp>
 
 
 #include <log/dummylog.h>
 #include <log/dummylog.h>

+ 3 - 0
src/lib/asiolink/udp_query.cc

@@ -14,6 +14,9 @@
 
 
 #include <config.h>
 #include <config.h>
 
 
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
 #include <asio.hpp>
 #include <asio.hpp>
 
 
 #include <boost/bind.hpp>
 #include <boost/bind.hpp>

+ 3 - 0
src/lib/asiolink/udp_server.cc

@@ -16,6 +16,9 @@
 
 
 #include <boost/shared_array.hpp>
 #include <boost/shared_array.hpp>
 
 
+// unistd is needed for asio.hpp with SunStudio
+#include <unistd.h>
+
 #include <asio.hpp>
 #include <asio.hpp>
 
 
 #include <log/dummylog.h>
 #include <log/dummylog.h>