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 2014/04/03 02:19:52 UTC
git commit: Adjusted the includes in stout/net.hpp to avoid
definition conflicts caused by netlink.
Repository: mesos
Updated Branches:
refs/heads/master 653462ccd -> d83f9f98c
Adjusted the includes in stout/net.hpp to avoid definition conflicts caused by netlink.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d83f9f98
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d83f9f98
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d83f9f98
Branch: refs/heads/master
Commit: d83f9f98c5f568859f02b8245787335efdfe7871
Parents: 653462c
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Mar 28 18:09:20 2014 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 2 17:19:07 2014 -0700
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d83f9f98/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp
index 7829d0e..42819ab 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/net.hpp
@@ -25,11 +25,12 @@
#include <arpa/inet.h>
#ifdef __linux__
+#include <linux/if.h>
#include <linux/if_packet.h>
#endif
-#include <net/if.h>
#ifdef __APPLE__
+#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#endif