Date: Wed, 4 Jun 2014 03:44:16 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1591 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201406040344.s543iGKp094588@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jun 4 03:44:15 2014
New Revision: 1591
Log:
sync dragonfly fix with upstream
Modified:
trunk/mail/thunderbird/files/patch-bug916589
trunk/www/firefox-esr/files/patch-bug916589
trunk/www/firefox/files/patch-bug916589
trunk/www/libxul/files/patch-bug916589
trunk/www/seamonkey/files/patch-bug916589
Modified: trunk/mail/thunderbird/files/patch-bug916589
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug916589 Sat May 31 14:37:47 2014 (r1590)
+++ trunk/mail/thunderbird/files/patch-bug916589 Wed Jun 4 03:44:15 2014 (r1591)
@@ -2,17 +2,8 @@
index 5b50785..7cf47d5 100644
--- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+++ mozilla/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 @@
#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 @@
/*
* 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 *) \
Modified: trunk/www/firefox-esr/files/patch-bug916589
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug916589 Sat May 31 14:37:47 2014 (r1590)
+++ trunk/www/firefox-esr/files/patch-bug916589 Wed Jun 4 03:44:15 2014 (r1591)
@@ -2,17 +2,8 @@
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 @@
#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 @@
/*
* 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 *) \
Modified: trunk/www/firefox/files/patch-bug916589
==============================================================================
--- trunk/www/firefox/files/patch-bug916589 Sat May 31 14:37:47 2014 (r1590)
+++ trunk/www/firefox/files/patch-bug916589 Wed Jun 4 03:44:15 2014 (r1591)
@@ -2,17 +2,8 @@
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 @@
#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 @@
/*
* 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 *) \
Modified: trunk/www/libxul/files/patch-bug916589
==============================================================================
--- trunk/www/libxul/files/patch-bug916589 Sat May 31 14:37:47 2014 (r1590)
+++ trunk/www/libxul/files/patch-bug916589 Wed Jun 4 03:44:15 2014 (r1591)
@@ -2,17 +2,8 @@
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 @@
#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 @@
/*
* 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 *) \
Modified: trunk/www/seamonkey/files/patch-bug916589
==============================================================================
--- trunk/www/seamonkey/files/patch-bug916589 Sat May 31 14:37:47 2014 (r1590)
+++ trunk/www/seamonkey/files/patch-bug916589 Wed Jun 4 03:44:15 2014 (r1591)
@@ -2,17 +2,8 @@
index 5b50785..7cf47d5 100644
--- mozilla/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h
+++ mozilla/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 @@
#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 @@
/*
* 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 *) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406040344.s543iGKp094588>