mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-29 01:13:08 +00:00
b6e8f8d98d
- Update Firefox ESR to 24.5.0 - Update Thunderbird to 24.5.0 - Update NSS to 3.16 - Use port dependency for soundtouch library - Require recent graphite2 version explicitly [1] - Require gst-libav version that doesn't crash on seeking [2] and doesn't error out on plugin load [3] - Remove gstreamer note in pkg-message for www/firefox, [3] may still happen with www/firefox-esr but only until it tracks esr31 (ca 2014-09-01) - Fix USE_XPI in mail/thunderbird-i18n [4] Security: http://www.vuxml.org/freebsd/985d4d6c-cfbd-11e3-a003-b4b52fce4ce8.html PR: ports/187939 [1] PR: ports/188133 [2] PR: ports/181964 [3] PR: ports/188984 [4] Submitted by: Toomas Aas <toomas.aas@raad.tartu.ee> [1] Submitted by: Jakub Lach <jakub_lach@mailplus.pl> [2] Submitted by: Jan Beich [3] and this update! Submitted by: Toni Ballesta <mustelator@yahoo.es> [4] Approved by: portmgr (bdrewery, security update to non-staged port)
45 lines
1.6 KiB
Plaintext
45 lines
1.6 KiB
Plaintext
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,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_)
|
|
#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)
|
|
|