aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net_base_address__tracker__linux.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-net_base_address__tracker__linux.h')
-rw-r--r--www/chromium/files/patch-net_base_address__tracker__linux.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h
new file mode 100644
index 000000000000..3ef11c4e032d
--- /dev/null
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.h
@@ -0,0 +1,28 @@
+--- net/base/address_tracker_linux.h.orig 2016-05-25 15:01:03.000000000 -0400
++++ net/base/address_tracker_linux.h 2016-05-27 11:17:51.228810000 -0400
+@@ -6,10 +6,12 @@
+ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
+
+ #include <sys/socket.h> // Needed to include netlink.
++#if !defined(OS_FREEBSD)
+ // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
+ #define net net_kernel
+ #include <linux/rtnetlink.h>
+ #undef net
++#endif
+ #include <stddef.h>
+
+ #include <map>
+@@ -33,8 +35,11 @@
+ class NET_EXPORT_PRIVATE AddressTrackerLinux :
+ public base::MessageLoopForIO::Watcher {
+ public:
++#if !defined(OS_FREEBSD)
+ typedef std::map<IPAddress, struct ifaddrmsg> AddressMap;
+-
++#else
++ typedef void* AddressMap;
++#endif
+ // Non-tracking version constructor: it takes a snapshot of the
+ // current system configuration. Once Init() returns, the
+ // configuration is available through GetOnlineLinks() and