Repository: mesos Updated Branches: refs/heads/master 974c4cd72 -> 45b8f20fc
Fixed build error caused by overloading socket call on CentOS 5. Review: https://reviews.apache.org/r/28854 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/45b8f20f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/45b8f20f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/45b8f20f Branch: refs/heads/master Commit: 45b8f20fc3164faf4793068e5a2fe47edd856c67 Parents: 974c4cd Author: Evelina Dumitrescu <[email protected]> Authored: Tue Dec 9 09:27:21 2014 -0800 Committer: Ian Downes <[email protected]> Committed: Tue Dec 9 11:28:26 2014 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/socket.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/45b8f20f/3rdparty/libprocess/include/process/socket.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/socket.hpp b/3rdparty/libprocess/include/process/socket.hpp index 916576f..91f9084 100644 --- a/3rdparty/libprocess/include/process/socket.hpp +++ b/3rdparty/libprocess/include/process/socket.hpp @@ -158,13 +158,13 @@ public: // Supported in Linux >= 2.6.27. #if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) Try<int> fd = - socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); + process::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); if (fd.isError()) { ABORT("Failed to create socket: " + fd.error()); } #else - Try<int> fd = socket(AF_INET, SOCK_STREAM, 0); + Try<int> fd = process::socket(AF_INET, SOCK_STREAM, 0); if (fd.isError()) { ABORT("Failed to create socket: " + fd.error()); }
