[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mesos-commits
Subject:    [13/35] git commit: Fixes os::environ for OS X.
From:       benh () apache ! org
Date:       2013-05-29 17:40:51
Message-ID: 5825c4c9122440088af2705ce051c7f0 () git ! apache ! org
[Download RAW message or body]

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 <benh@twitter.com>
Authored: Tue May 28 13:23:39 2013 -0700
Committer: Benjamin Hindman <benh@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
 }
 
 


[prev in list] [next in list] [prev in thread] [next in thread]