diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 12:58:54 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-08 12:58:54 +0100 |
commit | f3e1c3cf993b0ba54afa0ff9552ffefd39828b23 (patch) | |
tree | 1f5d52b7dff4a5c60e17c8f0fd7f7412c946a0ee /package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c | |
parent | d77656116191a166ed0477cf16830480a2406fc5 (diff) | |
parent | d93c019f2cfdf53be59f02600cc25c547ba24edc (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c')
-rw-r--r-- | package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c index be14ca662..bf6c335de 100644 --- a/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c +++ b/package/firefox/patches/patch-media_mtransport_third_party_nICEr_src_stun_addrs_c @@ -1,11 +1,33 @@ ---- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-09-11 01:15:16.000000000 +0200 -+++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-12-10 13:18:17.000000000 +0100 -@@ -59,7 +59,7 @@ static char *RCSSTRING __UNUSED__="$Id: +--- mozilla-release.orig/media/mtransport/third_party/nICEr/src/stun/addrs.c 2013-12-05 17:07:48.000000000 +0100 ++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/addrs.c 2014-01-03 13:06:22.000000000 +0100 +@@ -53,7 +53,9 @@ static char *RCSSTRING __UNUSED__="$Id: + #undef __unused + #include <linux/sysctl.h> + #endif ++#if defined(__GLIBC__) + #include <net/if.h> ++#endif + #ifndef LINUX + #if !defined(__OpenBSD__) && !defined(__NetBSD__) + #include <net/if_var.h> +@@ -61,14 +63,17 @@ static char *RCSSTRING __UNUSED__="$Id: #include <net/if_dl.h> #include <net/if_types.h> #include <sys/sockio.h> -#else -+#elif __GLIBC__ ++#elif defined(__GLIBC__) + #include <linux/sockios.h> #include <linux/if.h> + #include <linux/kernel.h> + #include <linux/wireless.h> +-#ifndef ANDROID + #include <linux/ethtool.h> +-#endif ++#else ++#include <linux/sockios.h> ++#include <linux/kernel.h> ++#include <linux/wireless.h> ++#include <linux/ethtool.h> #endif #include <net/route.h> + |