Repository: mesos Updated Branches: refs/heads/master 894dbb21f -> 037e0f83e
FreeBSD: Fix includes in stout. Review: https://reviews.apache.org/r/41596/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8f014239 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8f014239 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8f014239 Branch: refs/heads/master Commit: 8f0142391bb71ef088309c6b9a157bcb06bd5eaf Parents: 894dbb2 Author: David Forsythe <[email protected]> Authored: Wed Jan 20 14:48:30 2016 -0800 Committer: Ian Downes <[email protected]> Committed: Wed Jan 20 14:52:45 2016 -0800 ---------------------------------------------------------------------- .../libprocess/3rdparty/stout/include/stout/os/freebsd.hpp | 6 ++---- 3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8f014239/3rdparty/libprocess/3rdparty/stout/include/stout/os/freebsd.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/freebsd.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/freebsd.hpp index 269e35f..10346de 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/freebsd.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/freebsd.hpp @@ -18,14 +18,12 @@ #error "stout/os/freebsd.hpp is only available on FreeBSD systems." #endif -#include <sys/sysctl.h> #include <sys/types.h> -#ifdef __FreeBSD__ -#include <stout/os/freebsd.hpp> -#endif #include <sys/user.h> #include <unistd.h> +#include <stout/os/sysctl.hpp> + namespace os { inline Result<Process> process(pid_t pid) http://git-wip-us.apache.org/repos/asf/mesos/blob/8f014239/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp index 8cfc77f..bb78bb6 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp @@ -13,7 +13,7 @@ #ifndef __STOUT_OS_SYSCTL_HPP__ #define __STOUT_OS_SYSCTL_HPP__ -// Only provide sysctl support for OS X. +// Only provide sysctl support for OS X and FreeBSD. #if !defined(__APPLE__) && !defined(__FreeBSD__) #error "stout/os/sysctl.hpp is only available on OS X and FreeBSD." #endif
