You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/04/05 22:16:05 UTC
mesos git commit: Made functions inline to avoid linker issues in
stout.
Repository: mesos
Updated Branches:
refs/heads/master 634f11b27 -> b7ab78b02
Made functions inline to avoid linker issues in stout.
Review: https://reviews.apache.org/r/44137/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b7ab78b0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b7ab78b0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b7ab78b0
Branch: refs/heads/master
Commit: b7ab78b02a8893d4552b124e84a336fb64898ff9
Parents: 634f11b
Author: Daniel Pravat <dp...@outlook.com>
Authored: Tue Apr 5 12:52:47 2016 -0700
Committer: Michael Park <mp...@apache.org>
Committed: Tue Apr 5 13:15:54 2016 -0700
----------------------------------------------------------------------
.../3rdparty/stout/include/stout/internal/windows/grp.hpp | 5 +----
.../3rdparty/stout/include/stout/internal/windows/pwd.hpp | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7ab78b0/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/grp.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/grp.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/grp.hpp
index 1b74be6..232588c 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/grp.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/grp.hpp
@@ -32,7 +32,6 @@ struct group
};
-extern "C" {
// Dummy implementation of `getgrgid` for POSIX compliance. Per the POSIX
// specification[1], we are to return `NULL` if an entry matching the GID is
// not found. On Windows, we will never find such an entry, so we always return
@@ -40,12 +39,10 @@ extern "C" {
// function is not implemented.
//
// [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/getgrgid.html
-struct group* getgrgid(gid_t)
+inline struct group* getgrgid(gid_t)
{
errno = ENOSYS;
return NULL;
}
-} // extern "C" {
-
#endif // __STOUT_INTERNAL_WINDOWS_GRP_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/b7ab78b0/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/pwd.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/pwd.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/pwd.hpp
index 60990bb..46e3ec2 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/pwd.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/internal/windows/pwd.hpp
@@ -33,7 +33,6 @@ struct passwd
};
-extern "C" {
// Dummy implementation of `getpwuid` for POSIX compliance. Per the POSIX
// specification[1], we are to return `NULL` if an entry matching the UID is
// not found. On Windows, we will never find such an entry, so we always return
@@ -41,12 +40,10 @@ extern "C" {
// function is not implemented.
//
// [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/getgrgid.html
-struct passwd* getpwuid(uid_t)
+inline struct passwd* getpwuid(uid_t)
{
errno = ENOSYS;
return NULL;
}
-} // extern "C" {
-
#endif // __STOUT_INTERNAL_WINDOWS_PWD_HPP__