blob: f6cd6376116f56e55e350cd40d9d04c8fa8040b1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
--- third_party/webrtc/base/network.cc.orig 2014-10-10 09:16:13 UTC
+++ third_party/webrtc/base/network.cc
@@ -18,7 +18,7 @@
// linux/if.h can't be included at the same time as the posix sys/if.h, and
// it's transitively required by linux/route.h, so include that version on
// linux instead of the standard posix one.
-#if defined(WEBRTC_LINUX)
+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
#include <linux/if.h>
#include <linux/route.h>
#elif !defined(__native_client__)
@@ -479,7 +479,7 @@
}
#endif // WEBRTC_WIN
-#if defined(WEBRTC_LINUX)
+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
bool IsDefaultRoute(const std::string& network_name) {
FileStream fs;
if (!fs.Open("/proc/net/route", "r", NULL)) {
@@ -519,7 +519,7 @@
strncmp(network.name().c_str(), "vnic", 4) == 0) {
return true;
}
-#if defined(WEBRTC_LINUX)
+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
// Make sure this is a default route, if we're ignoring non-defaults.
if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) {
return true;
|
