build/include: Redo som includes for FreeBSD

- During include cleanup just a too bit much was removed for FreeBSD
  to get things compiled.
  This redoes some of the includes.

Tracker: http://tracker.ceph.com/issues/19883
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

diff --git a/src/common/SubProcess.h b/src/common/SubProcess.h
index c35ae1fd31c5aeb2bb3955f043969b792f8b62fc..ce9559c5eeca10dfec77eb15888237431d19a358 100644 (file)
--- a/src/common/SubProcess.h
+++ b/src/common/SubProcess.h
@@ -24,6 +24,10 @@
 #include <iostream>
 #include <include/assert.h>
 #include <common/errno.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <signal.h>
+#endif
 
 /**
  * SubProcess:

diff --git a/src/common/event_socket.h b/src/common/event_socket.h
index 1f1f2c2d10bf96560040095f11b8a68800fe87ef..79e8e15a716a80a61fefe03e1fd7717186cb6d4d 100644 (file)
--- a/src/common/event_socket.h
+++ b/src/common/event_socket.h
@@ -17,8 +17,11 @@
 #ifndef CEPH_COMMON_EVENT_SOCKET_H
 #define CEPH_COMMON_EVENT_SOCKET_H
 
-#include "include/event_type.h"
 #include <unistd.h>
+#if defined(__FreeBSD__)
+#include <errno.h>
+#endif
+#include "include/event_type.h"
 
 class EventSocket {
   int socket;

diff --git a/src/common/io_priority.cc b/src/common/io_priority.cc
index 72ac637268f7f7f5820a9d264ef30f5d05494204..c635555ad682dc6534bafd241ba6939fbc67e665 100644 (file)
--- a/src/common/io_priority.cc
+++ b/src/common/io_priority.cc
@@ -12,14 +12,17 @@
  *
  */
 
-#include "io_priority.h"
-
 #include <unistd.h>
+#if defined(__FreeBSD__)
+#include <errno.h>
+#endif
 #ifdef __linux__
 #include <sys/syscall.h>   /* For SYS_xxx definitions */
 #endif
 #include <algorithm>
 
+#include "io_priority.h"
+
 pid_t ceph_gettid(void)
 {
 #ifdef __linux__

diff --git a/src/common/ipaddr.cc b/src/common/ipaddr.cc
index dcf5932345c023bf18fdd58fbe270c8ce5e31293..41add2de24e61b267ce8859aadc1e66d0cd3d6e6 100644 (file)
--- a/src/common/ipaddr.cc
+++ b/src/common/ipaddr.cc
@@ -1,9 +1,15 @@
-#include "include/ipaddr.h"
 
 #include <arpa/inet.h>
 #include <ifaddrs.h>
 #include <stdlib.h>
 #include <string.h>
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
+#include "include/ipaddr.h"
 
 static void netmask_ipv4(const struct in_addr *addr,
                         unsigned int prefix_len,

diff --git a/src/common/module.c b/src/common/module.c
index 06b32ed7d3ea93c9dc024c3f00bfe6cd0efa8da0..f19f74324c752db7e6164c875c9c022a39fee2e8 100644 (file)
--- a/src/common/module.c
+++ b/src/common/module.c
@@ -15,6 +15,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if defined(__FreeBSD__)
+#include <sys/wait.h>
+#endif 
 
 /*
  * TODO: Switch to libkmod when we abandon older platforms.  The APIs

diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc
index f6ecd2de51ff97259967ac0888a9fe2e5915ddb2..bf69b90a700a3509cade54f614242bd6eabb404e 100644 (file)
--- a/src/test/test_ipaddr.cc
+++ b/src/test/test_ipaddr.cc
@@ -4,6 +4,7 @@
 #if defined(__FreeBSD__)
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #endif
 #include <arpa/inet.h>
 #include <ifaddrs.h>