summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug916589
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-09-18 22:40:57 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-09-18 22:40:57 +0000
commitec4fcd4b2ae992fc8b3cedac4e53df84bbdf643d (patch)
tree424e8968903e2637d7f62a6c7e33ecfdbabacec0 /www/firefox/files/patch-bug916589
parentAdd comas, to improve grammar (diff)
- update firefox, thunderbird and libxul to 24.0
- update seamonkey to 2.21 - update firefox-esr to 17.0.9 - enable GSTREAMER by default for html5 with h264/aac/mp3 - WEBRTC is now always built - add PROFILE and TESTS options Security: 7dfed67b-20aa-11e3-b8d8-0025905a4771 In collaboration with: Jan Beich <jbeich@tormail.org>
Diffstat (limited to '')
-rw-r--r--www/firefox/files/patch-bug91658940
1 files changed, 40 insertions, 0 deletions
diff --git a/www/firefox/files/patch-bug916589 b/www/firefox/files/patch-bug916589
new file mode 100644
index 000000000000..664a7b167314
--- /dev/null
+++ b/www/firefox/files/patch-bug916589
@@ -0,0 +1,40 @@
+diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+index 5b50785..7cf47d5 100644
+--- media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
++++ media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+@@ -31,11 +31,14 @@
+ */
+
+-#ifndef _SYS_QUEUE_H_
++#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN)
++#include_next <sys/queue.h>
++#elif !defined(_SYS_QUEUE_H_)
+ #define _SYS_QUEUE_H_
+
+-#if !defined(__FreeBSD__) && !defined(DARWIN)
+ #include <stddef.h>
+-#define __offsetof offsetof
++
++#ifndef offsetof
++#define offsetof(type, field) ((size_t)(&((type *)0)->field))
+ #endif
+
+ #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
+@@ -43,8 +46,6 @@
+ (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
+ (var) = (tvar))
+
+-// #define __offsetof(type, field) ((size_t)(&((type *)0)->field))
+-
+ /*
+ * This file defines four types of data structures: singly-linked lists,
+ * singly-linked tail queues, lists and tail queues.
+@@ -285,7 +286,7 @@ struct { \
+ (STAILQ_EMPTY((head)) ? \
+ NULL : \
+ ((struct type *) \
+- ((char *)((head)->stqh_last) - __offsetof(struct type, field))))
++ ((char *)((head)->stqh_last) - offsetof(struct type, field))))
+
+ #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
+