You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2013/05/29 19:40:51 UTC
[13/35] git commit: Fixes os::environ for OS X.
Fixes os::environ for OS X.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/cc5e1e7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/cc5e1e7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/cc5e1e7b
Branch: refs/heads/master
Commit: cc5e1e7b704971301d386dafe47893ccfbaac792
Parents: 1caf21b
Author: Benjamin Hindman <be...@twitter.com>
Authored: Tue May 28 13:23:39 2013 -0700
Committer: Benjamin Hindman <be...@twitter.com>
Committed: Tue May 28 14:20:25 2013 -0700
----------------------------------------------------------------------
.../libprocess/3rdparty/stout/include/stout/os.hpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/cc5e1e7b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
index 28a08cc..1b3fb47 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp
@@ -74,8 +74,9 @@ inline char** environ()
// shared libraries.
#ifdef __APPLE__
return *_NSGetEnviron();
-#endif
+#else
return ::environ;
+#endif
}