You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2018/10/17 21:24:39 UTC

[mesos] branch 1.7.x updated: Fixed the FreeBSD MACRO as '__FreeBSD__' in posix/pipe.hpp.

This is an automated email from the ASF dual-hosted git repository.

gilbert pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/1.7.x by this push:
     new d04e274  Fixed the FreeBSD MACRO as '__FreeBSD__' in posix/pipe.hpp.
d04e274 is described below

commit d04e27482a387e8a65ddab016c2322648f2fbb6e
Author: Gilbert Song <so...@gmail.com>
AuthorDate: Wed Oct 17 00:58:55 2018 -0700

    Fixed the FreeBSD MACRO as '__FreeBSD__' in posix/pipe.hpp.
    
    Review: https://reviews.apache.org/r/69059
    (cherry picked from commit f9627b90521292add41432d15b4c12e036f94ca7)
---
 3rdparty/stout/include/stout/os/posix/pipe.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty/stout/include/stout/os/posix/pipe.hpp b/3rdparty/stout/include/stout/os/posix/pipe.hpp
index 9838d7b..ea1da00 100644
--- a/3rdparty/stout/include/stout/os/posix/pipe.hpp
+++ b/3rdparty/stout/include/stout/os/posix/pipe.hpp
@@ -35,7 +35,7 @@ inline Try<std::array<int, 2>> pipe()
   std::array<int, 2> result;
 
   // The pipe2() function appeared in FreeBSD 10.0.
-#if defined(_FreeBSD__) && __FreeBSD_version >= 1000000
+#if defined(__FreeBSD__) && __FreeBSD_version >= 1000000
 
   if (::pipe2(result.data(), O_CLOEXEC) < 0) {
     return ErrnoError();