aboutsummaryrefslogtreecommitdiffstats
path: root/main/xulrunner/fix-media.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/xulrunner/fix-media.patch')
-rw-r--r--main/xulrunner/fix-media.patch36
1 files changed, 27 insertions, 9 deletions
diff --git a/main/xulrunner/fix-media.patch b/main/xulrunner/fix-media.patch
index 49010333d2..5912d3cc2c 100644
--- a/main/xulrunner/fix-media.patch
+++ b/main/xulrunner/fix-media.patch
@@ -1,12 +1,30 @@
--- mozilla-release/media.orig/mtransport/third_party/nICEr/src/stun/addrs.c
+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c
-@@ -59,8 +59,8 @@
- #include <net/if_dl.h>
- #include <net/if_types.h>
- #include <sys/sockio.h>
--#else
-+#elif defined(__GLIBC__)
- #include <linux/if.h>
+@@ -53,7 +53,6 @@
+ #undef __unused
+ #include <linux/sysctl.h>
#endif
- #include <net/route.h>
-
+-#include <net/if.h>
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>
+@@ -63,8 +62,8 @@
+ #include <sys/sockio.h>
+ #else
+ #include <linux/sockios.h>
+-#include <linux/if.h>
+ #include <linux/kernel.h>
++#include <linux/if.h>
+ #include <linux/wireless.h>
+ #ifndef ANDROID
+ #include <linux/ethtool.h>
+--- mozilla-release/media.orig/mtransport/third_party/nICEr/src/stun/stun.h
++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h
+@@ -39,7 +39,6 @@
+ #else
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <net/if.h>
+ #ifndef LINUX
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__)
+ #include <net/if_var.h>