You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/09/24 01:53:59 UTC
[4/4] git commit: Removed duplicated definition of gethostbyname2_r.
Removed duplicated definition of gethostbyname2_r.
When compiling on an Apple the gethostbyname2_r function is defined
twice; once in libprocess/src/pid.cpp and once in stout/os.hpp.
This patch removes the unnecessary definition from
libprocess/src/pid.cpp.
From: David Mackey <td...@booleanhaiku.com>
Review: https://reviews.apache.org/r/13988
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/94f59486
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/94f59486
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/94f59486
Branch: refs/heads/master
Commit: 94f594869ac5818dea05ad2246dcafc728aa0e40
Parents: b60eb98
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Sep 23 16:31:44 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon Sep 23 16:31:44 2013 -0700
----------------------------------------------------------------------
3rdparty/libprocess/src/pid.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/94f59486/3rdparty/libprocess/src/pid.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/pid.cpp b/3rdparty/libprocess/src/pid.cpp
index 8f32b08..81c2b2b 100644
--- a/3rdparty/libprocess/src/pid.cpp
+++ b/3rdparty/libprocess/src/pid.cpp
@@ -15,12 +15,9 @@
#include <process/pid.hpp>
#include <process/process.hpp>
-#include "config.hpp"
+#include <stout/os.hpp>
-#ifdef __APPLE__
-#define gethostbyname2_r(name, af, ret, buf, buflen, result, h_errnop) \
- ({ *(result) = gethostbyname2(name, af); 0; })
-#endif // __APPLE__
+#include "config.hpp"
using std::istream;