summaryrefslogtreecommitdiff
path: root/www/firefox/files/patch-bug916589
diff options
context:
space:
mode:
authorBeat Gaetzi <beat@FreeBSD.org>2014-06-11 03:42:55 +0000
committerBeat Gaetzi <beat@FreeBSD.org>2014-06-11 03:42:55 +0000
commit0557b9315d4e0c460a7150b697ad040a7084852d (patch)
tree95c4039ece9c88b497d122c1719bf5d754d803a8 /www/firefox/files/patch-bug916589
parentStagify. (diff)
- Update Firefox to 30.0
- Update Firefox ESR to 24.6.0 - Update libxul to 24.6.0 - Update NSS to 3.16.1 - Update NSPR to 4.10.6 - Update Thunderbird to 24.6.0 - Convert USE_BZIP2 to USES - Backport ff31 fix against crashing DEBUG build on newegg.com [1] - Add a note in UPDATING to not build audio/soundtouch with INTEGER_SAMPLES [2] - Use arc4random_buf(3) to generate UUIDs (version 4) - Fix debugger detection used by Telemetry and the slow script dialog - Add STAGE support [3] PR: ports/189991 [1] PR: ports/189217 [2] PR: ports/189488 [2] Submitted by: bapt [3] Sumbitted by: Jan Beich Security: http://www.vuxml.org/freebsd/888a0262-f0d9-11e3-ba0c-b4b52fce4ce8.html
Notes
Notes: svn path=/head/; revision=357413
Diffstat (limited to 'www/firefox/files/patch-bug916589')
-rw-r--r--www/firefox/files/patch-bug91658917
1 files changed, 4 insertions, 13 deletions
diff --git a/www/firefox/files/patch-bug916589 b/www/firefox/files/patch-bug916589
index 5748c3316f85..c6c6c58c9175 100644
--- a/www/firefox/files/patch-bug916589
+++ b/www/firefox/files/patch-bug916589
@@ -2,17 +2,8 @@ diff --git media/mtransport/third_party/nrappkit/src/port/generic/include/sys/qu
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,18 @@
- */
-
--#ifndef _SYS_QUEUE_H_
-+#if (defined(BSD) && !defined(__OpenBSD__)) || defined(DARWIN)
-+#include_next <sys/queue.h>
-+# if defined(__DragonFly__)
-+#define STAILQ_FOREACH_SAFE STAILQ_FOREACH_MUTABLE
-+#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE
-+# endif
-+#elif !defined(_SYS_QUEUE_H_)
+@@ -33,9 +33,10 @@
+ #ifndef _SYS_QUEUE_H_
#define _SYS_QUEUE_H_
-#if !defined(__FreeBSD__) && !defined(DARWIN)
@@ -24,7 +15,7 @@ index 5b50785..7cf47d5 100644
#endif
#define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
-@@ -43,8 +46,6 @@
+@@ -43,8 +44,6 @@
(var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
(var) = (tvar))
@@ -33,7 +24,7 @@ index 5b50785..7cf47d5 100644
/*
* This file defines four types of data structures: singly-linked lists,
* singly-linked tail queues, lists and tail queues.
-@@ -285,7 +286,7 @@ struct { \
+@@ -285,7 +284,7 @@ struct { \
(STAILQ_EMPTY((head)) ? \
NULL : \
((struct type *) \