diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-19 18:01:35 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-19 18:01:35 +0000 |
| commit | d4c94d84fa09bdd58fc0413a958966caa13c5f84 (patch) | |
| tree | 35a6ce0d6199dbcde926af0da2354d851c73f0ef /main/xulrunner/fix-media.patch | |
| parent | 0a87c68d217e72e9d823fb00f11047bab47b914f (diff) | |
| download | aports-d4c94d84fa09bdd58fc0413a958966caa13c5f84.tar.bz2 aports-d4c94d84fa09bdd58fc0413a958966caa13c5f84.tar.xz | |
main/xulrunner: rebase musl patches, and fix musl build
Diffstat (limited to 'main/xulrunner/fix-media.patch')
| -rw-r--r-- | main/xulrunner/fix-media.patch | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/main/xulrunner/fix-media.patch b/main/xulrunner/fix-media.patch index 49010333d..5912d3cc2 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> |