You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2017/05/09 07:40:23 UTC
mesos git commit: Changed `#elif ...` to `#elif defined(...)` in
Mesos.
Repository: mesos
Updated Branches:
refs/heads/master 3742945b3 -> 8f7acb5a1
Changed `#elif ...` to `#elif defined(...)` in Mesos.
Review: https://reviews.apache.org/r/59063/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8f7acb5a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8f7acb5a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8f7acb5a
Branch: refs/heads/master
Commit: 8f7acb5a1b80f7b19268ec228fb74441de38831a
Parents: 3742945
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
Authored: Tue May 9 09:40:13 2017 +0200
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue May 9 09:40:13 2017 +0200
----------------------------------------------------------------------
src/linux/ns.hpp | 2 +-
src/slave/containerizer/mesos/containerizer.cpp | 2 +-
src/slave/flags.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f7acb5a/src/linux/ns.hpp
----------------------------------------------------------------------
diff --git a/src/linux/ns.hpp b/src/linux/ns.hpp
index da4b716..941c7ee 100644
--- a/src/linux/ns.hpp
+++ b/src/linux/ns.hpp
@@ -86,7 +86,7 @@ inline int setns(int fd, int nstype)
{
#ifdef SYS_setns
return ::syscall(SYS_setns, fd, nstype);
-#elif __x86_64__
+#elif defined(__x86_64__)
// A workaround for those hosts that have an old glibc (older than
// 2.14) but have a new kernel. The magic number '308' here is the
// syscall number for 'setns' on x86_64 architecture.
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f7acb5a/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 58ab745..1e2596c 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -230,7 +230,7 @@ Try<MesosContainerizer*> MesosContainerizer::create(
} else {
return Error("Unknown or unsupported launcher: " + flags_.launcher);
}
-#elif __WINDOWS__
+#elif defined(__WINDOWS__)
if (flags_.launcher != "windows") {
return Error("Unsupported launcher: " + flags_.launcher);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/8f7acb5a/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index ed99fad..bc63a6a 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -120,7 +120,7 @@ mesos::internal::slave::Flags::Flags()
"launcher if it's running as root on Linux.",
#ifdef __linux__
LinuxLauncher::available() ? "linux" : "posix"
-#elif __WINDOWS__
+#elif defined(__WINDOWS__)
"windows"
#else
"posix"