mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-01 01:17:02 +00:00
0557b9315d
- 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
36 lines
1.3 KiB
Plaintext
36 lines
1.3 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
|
|
@@ -33,9 +33,10 @@
|
|
#ifndef _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 +44,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 +284,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)
|
|
|