Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jan 2013 10:36:10 +0400
From:      Andrey Chernov <ache@freebsd.org>
To:        Florian Smeets <flo@smeets.im>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, Christian Weisgerber <naddy@mips.inka.de>, mvharding@gmail.com, ports-committers@freebsd.org
Subject:   Re: svn commit: r310207 - in head: Mk www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files www/firefox-i18n www/firefox/files www/seamonkey www/seamonkey-i18n www/seamonkey/files
Message-ID:  <50EFB2DA.60309@freebsd.org>
In-Reply-To: <50EFB02E.7020402@smeets.im>
References:  <201301102229.r0AMTOBl054811@svn.freebsd.org> <50EF64B7.7040902@freebsd.org> <50EFB02E.7020402@smeets.im>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
------enig2NBADNRCEJSMJVVDMAPXX
Content-Type: multipart/mixed;
 boundary="------------000603080608000406060702"

This is a multi-part message in MIME format.
--------------000603080608000406060702
Content-Type: text/plain; charset=KOI8-R
Content-Transfer-Encoding: quoted-printable

On 11.01.2013 10:24, Florian Smeets wrote:>> 1 out of 1 hunks
failed--saving rejects to
>>
media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.=
h.rej
>> =3D> Patch patch-bug807492 failed to apply cleanly.

> Looks like I need more details.

Today's -stable on i386, port options are default, queue.h and
queue.h.rej are attached, if it helps.


--------------000603080608000406060702
Content-Type: text/plain; charset=windows-1251;
 name="queue.h"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="queue.h"

/*
 * Copyright (c) 1991, 1993
 *	The Regents of the University of California.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the=

 *    documentation and/or other materials provided with the distribution=
=2E
 * 4. Neither the name of the University nor the names of its contributor=
s
 *    may be used to endorse or promote products derived from this softwa=
re
 *    without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AN=
D
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PUR=
POSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIAB=
LE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUEN=
TIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOOD=
S
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ST=
RICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY =
WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF=

 * SUCH DAMAGE.
 *
 *	@(#)queue.h	8.5 (Berkeley) 8/20/94
 * $FreeBSD: src/sys/sys/queue.h,v 1.58 2004/04/07 04:19:49 imp Exp $
 */

#ifndef _SYS_QUEUE_H_
#define	_SYS_QUEUE_H_

#ifndef DARWIN
#include <stddef.h>
#define __offsetof offsetof
#endif

#define STAILQ_FOREACH_SAFE(var, head, field, tvar)                     \=

         for ((var) =3D STAILQ_FIRST((head));                            =
  \
             (var) && ((tvar) =3D STAILQ_NEXT((var), field), 1);         =
  \
             (var) =3D (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.
 *
 * A singly-linked list is headed by a single forward pointer. The elemen=
ts
 * are singly linked for minimum space and pointer manipulation overhead =
at
 * the expense of O(n) removal for arbitrary elements. New elements can b=
e
 * added to the list after an existing element or at the head of the list=
=2E
 * Elements being removed from the head of the list should use the explic=
it
 * macro for this purpose for optimum efficiency. A singly-linked list ma=
y
 * only be traversed in the forward direction.  Singly-linked lists are i=
deal
 * for applications with large datasets and few or no removals or for
 * implementing a LIFO queue.
 *
 * A singly-linked tail queue is headed by a pair of pointers, one to the=

 * head of the list and the other to the tail of the list. The elements a=
re
 * singly linked for minimum space and pointer manipulation overhead at t=
he
 * expense of O(n) removal for arbitrary elements. New elements can be ad=
ded
 * to the list after an existing element, at the head of the list, or at =
the
 * end of the list. Elements being removed from the head of the tail queu=
e
 * should use the explicit macro for this purpose for optimum efficiency.=

 * A singly-linked tail queue may only be traversed in the forward direct=
ion.
 * Singly-linked tail queues are ideal for applications with large datase=
ts
 * and few or no removals or for implementing a FIFO queue.
 *
 * A list is headed by a single forward pointer (or an array of forward
 * pointers for a hash table header). The elements are doubly linked
 * so that an arbitrary element can be removed without a need to
 * traverse the list. New elements can be added to the list before
 * or after an existing element or at the head of the list. A list
 * may only be traversed in the forward direction.
 *
 * A tail queue is headed by a pair of pointers, one to the head of the
 * list and the other to the tail of the list. The elements are doubly
 * linked so that an arbitrary element can be removed without a need to
 * traverse the list. New elements can be added to the list before or
 * after an existing element, at the head of the list, or at the end of
 * the list. A tail queue may be traversed in either direction.
 *
 * For details on the use of these macros, see the queue(3) manual page.
 *
 *
 *				SLIST	LIST	STAILQ	TAILQ
 * _HEAD			+	+	+	+
 * _HEAD_INITIALIZER		+	+	+	+
 * _ENTRY			+	+	+	+
 * _INIT			+	+	+	+
 * _EMPTY			+	+	+	+
 * _FIRST			+	+	+	+
 * _NEXT			+	+	+	+
 * _PREV			-	-	-	+
 * _LAST			-	-	+	+
 * _FOREACH			+	+	+	+
 * _FOREACH_SAFE		+	+	+	+
 * _FOREACH_REVERSE		-	-	-	+
 * _FOREACH_REVERSE_SAFE	-	-	-	+
 * _INSERT_HEAD			+	+	+	+
 * _INSERT_BEFORE		-	+	-	+
 * _INSERT_AFTER		+	+	+	+
 * _INSERT_TAIL			-	-	+	+
 * _CONCAT			-	-	+	+
 * _REMOVE_HEAD			+	-	+	-
 * _REMOVE			+	+	+	+
 *
 */
#define	QUEUE_MACRO_DEBUG 0
#if QUEUE_MACRO_DEBUG
/* Store the last 2 places the queue element or head was altered */
struct qm_trace {
	char * lastfile;
	int lastline;
	char * prevfile;
	int prevline;
};

#define	TRACEBUF	struct qm_trace trace;
#define	TRASHIT(x)	do {(x) =3D (void *)-1;} while (0)

#define	QMD_TRACE_HEAD(head) do {					\
	(head)->trace.prevline =3D (head)->trace.lastline;		\
	(head)->trace.prevfile =3D (head)->trace.lastfile;		\
	(head)->trace.lastline =3D __LINE__;				\
	(head)->trace.lastfile =3D __FILE__;				\
} while (0)

#define	QMD_TRACE_ELEM(elem) do {					\
	(elem)->trace.prevline =3D (elem)->trace.lastline;		\
	(elem)->trace.prevfile =3D (elem)->trace.lastfile;		\
	(elem)->trace.lastline =3D __LINE__;				\
	(elem)->trace.lastfile =3D __FILE__;				\
} while (0)

#else
#define	QMD_TRACE_ELEM(elem)
#define	QMD_TRACE_HEAD(head)
#define	TRACEBUF
#define	TRASHIT(x)
#endif	/* QUEUE_MACRO_DEBUG */

/*
 * Singly-linked List declarations.
 */
#define	SLIST_HEAD(name, type)						\
struct name {								\
	struct type *slh_first;	/* first element */			\
}

#define	SLIST_HEAD_INITIALIZER(head)					\
	{ NULL }

#define	SLIST_ENTRY(type)						\
struct {								\
	struct type *sle_next;	/* next element */			\
}

/*
 * Singly-linked List functions.
 */
#define	SLIST_EMPTY(head)	((head)->slh_first =3D=3D NULL)

#define	SLIST_FIRST(head)	((head)->slh_first)

#define	SLIST_FOREACH(var, head, field)					\
	for ((var) =3D SLIST_FIRST((head));				\
	    (var);							\
	    (var) =3D SLIST_NEXT((var), field))

#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
	for ((var) =3D SLIST_FIRST((head));				\
	    (var) && ((tvar) =3D SLIST_NEXT((var), field), 1);		\
	    (var) =3D (tvar))

#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
	for ((varp) =3D &SLIST_FIRST((head));				\
	    ((var) =3D *(varp)) !=3D NULL;					\
	    (varp) =3D &SLIST_NEXT((var), field))

#define	SLIST_INIT(head) do {						\
	SLIST_FIRST((head)) =3D NULL;					\
} while (0)

#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
	SLIST_NEXT((elm), field) =3D SLIST_NEXT((slistelm), field);	\
	SLIST_NEXT((slistelm), field) =3D (elm);				\
} while (0)

#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
	SLIST_NEXT((elm), field) =3D SLIST_FIRST((head));			\
	SLIST_FIRST((head)) =3D (elm);					\
} while (0)

#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)

#define	SLIST_REMOVE(head, elm, type, field) do {			\
	if (SLIST_FIRST((head)) =3D=3D (elm)) {				\
		SLIST_REMOVE_HEAD((head), field);			\
	}								\
	else {								\
		struct type *curelm =3D SLIST_FIRST((head));		\
		while (SLIST_NEXT(curelm, field) !=3D (elm))		\
			curelm =3D SLIST_NEXT(curelm, field);		\
		SLIST_NEXT(curelm, field) =3D				\
		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
	}								\
} while (0)

#define	SLIST_REMOVE_HEAD(head, field) do {				\
	SLIST_FIRST((head)) =3D SLIST_NEXT(SLIST_FIRST((head)), field);	\
} while (0)

/*
 * Singly-linked Tail queue declarations.
 */
#define	STAILQ_HEAD(name, type)						\
struct name {								\
	struct type *stqh_first;/* first element */			\
	struct type **stqh_last;/* addr of last next element */		\
}

#define	STAILQ_HEAD_INITIALIZER(head)					\
	{ NULL, &(head).stqh_first }

#define	STAILQ_ENTRY(type)						\
struct {								\
	struct type *stqe_next;	/* next element */			\
}

/*
 * Singly-linked Tail queue functions.
 */
#define	STAILQ_CONCAT(head1, head2) do {				\
	if (!STAILQ_EMPTY((head2))) {					\
		*(head1)->stqh_last =3D (head2)->stqh_first;		\
		(head1)->stqh_last =3D (head2)->stqh_last;		\
		STAILQ_INIT((head2));					\
	}								\
} while (0)

#define	STAILQ_EMPTY(head)	((head)->stqh_first =3D=3D NULL)

#define	STAILQ_FIRST(head)	((head)->stqh_first)

#define	STAILQ_FOREACH(var, head, field)				\
	for((var) =3D STAILQ_FIRST((head));				\
	   (var);							\
	   (var) =3D STAILQ_NEXT((var), field))


#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
	for ((var) =3D STAILQ_FIRST((head));				\
	    (var) && ((tvar) =3D STAILQ_NEXT((var), field), 1);		\
	    (var) =3D (tvar))

#define	STAILQ_INIT(head) do {						\
	STAILQ_FIRST((head)) =3D NULL;					\
	(head)->stqh_last =3D &STAILQ_FIRST((head));			\
} while (0)

#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
	if ((STAILQ_NEXT((elm), field) =3D STAILQ_NEXT((tqelm), field)) =3D=3D N=
ULL)\
		(head)->stqh_last =3D &STAILQ_NEXT((elm), field);		\
	STAILQ_NEXT((tqelm), field) =3D (elm);				\
} while (0)

#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
	if ((STAILQ_NEXT((elm), field) =3D STAILQ_FIRST((head))) =3D=3D NULL)	\
		(head)->stqh_last =3D &STAILQ_NEXT((elm), field);		\
	STAILQ_FIRST((head)) =3D (elm);					\
} while (0)

#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
	STAILQ_NEXT((elm), field) =3D NULL;				\
	*(head)->stqh_last =3D (elm);					\
	(head)->stqh_last =3D &STAILQ_NEXT((elm), field);			\
} while (0)

#define	STAILQ_LAST(head, type, field)					\
	(STAILQ_EMPTY((head)) ?						\
		NULL :							\
	        ((struct type *)					\
		((char *)((head)->stqh_last) - __offsetof(struct type, field))))

#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)

#define	STAILQ_REMOVE(head, elm, type, field) do {			\
	if (STAILQ_FIRST((head)) =3D=3D (elm)) {				\
		STAILQ_REMOVE_HEAD((head), field);			\
	}								\
	else {								\
		struct type *curelm =3D STAILQ_FIRST((head));		\
		while (STAILQ_NEXT(curelm, field) !=3D (elm))		\
			curelm =3D STAILQ_NEXT(curelm, field);		\
		if ((STAILQ_NEXT(curelm, field) =3D			\
		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) =3D=3D NULL)\
			(head)->stqh_last =3D &STAILQ_NEXT((curelm), field);\
	}								\
} while (0)

#define	STAILQ_REMOVE_HEAD(head, field) do {				\
	if ((STAILQ_FIRST((head)) =3D					\
	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) =3D=3D NULL)		\
		(head)->stqh_last =3D &STAILQ_FIRST((head));		\
} while (0)

#define	STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {			\
	if ((STAILQ_FIRST((head)) =3D STAILQ_NEXT((elm), field)) =3D=3D NULL)	\
		(head)->stqh_last =3D &STAILQ_FIRST((head));		\
} while (0)

/*
 * List declarations.
 */
#define	LIST_HEAD(name, type)						\
struct name {								\
	struct type *lh_first;	/* first element */			\
}

#define	LIST_HEAD_INITIALIZER(head)					\
	{ NULL }

#define	LIST_ENTRY(type)						\
struct {								\
	struct type *le_next;	/* next element */			\
	struct type **le_prev;	/* address of previous next element */	\
}

/*
 * List functions.
 */

#define	LIST_EMPTY(head)	((head)->lh_first =3D=3D NULL)

#define	LIST_FIRST(head)	((head)->lh_first)

#define	LIST_FOREACH(var, head, field)					\
	for ((var) =3D LIST_FIRST((head));				\
	    (var);							\
	    (var) =3D LIST_NEXT((var), field))

#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
	for ((var) =3D LIST_FIRST((head));				\
	    (var) && ((tvar) =3D LIST_NEXT((var), field), 1);		\
	    (var) =3D (tvar))

#define	LIST_INIT(head) do {						\
	LIST_FIRST((head)) =3D NULL;					\
} while (0)

#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
	if ((LIST_NEXT((elm), field) =3D LIST_NEXT((listelm), field)) !=3D NULL)=
\
		LIST_NEXT((listelm), field)->field.le_prev =3D		\
		    &LIST_NEXT((elm), field);				\
	LIST_NEXT((listelm), field) =3D (elm);				\
	(elm)->field.le_prev =3D &LIST_NEXT((listelm), field);		\
} while (0)

#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
	(elm)->field.le_prev =3D (listelm)->field.le_prev;		\
	LIST_NEXT((elm), field) =3D (listelm);				\
	*(listelm)->field.le_prev =3D (elm);				\
	(listelm)->field.le_prev =3D &LIST_NEXT((elm), field);		\
} while (0)

#define	LIST_INSERT_HEAD(head, elm, field) do {				\
	if ((LIST_NEXT((elm), field) =3D LIST_FIRST((head))) !=3D NULL)	\
		LIST_FIRST((head))->field.le_prev =3D &LIST_NEXT((elm), field);\
	LIST_FIRST((head)) =3D (elm);					\
	(elm)->field.le_prev =3D &LIST_FIRST((head));			\
} while (0)

#define	LIST_NEXT(elm, field)	((elm)->field.le_next)

#define	LIST_REMOVE(elm, field) do {					\
	if (LIST_NEXT((elm), field) !=3D NULL)				\
		LIST_NEXT((elm), field)->field.le_prev =3D 		\
		    (elm)->field.le_prev;				\
	*(elm)->field.le_prev =3D LIST_NEXT((elm), field);		\
} while (0)

/*
 * Tail queue declarations.
 */
#define	TAILQ_HEAD(name, type)						\
struct name {								\
	struct type *tqh_first;	/* first element */			\
	struct type **tqh_last;	/* addr of last next element */		\
	TRACEBUF							\
}

#define	TAILQ_HEAD_INITIALIZER(head)					\
	{ NULL, &(head).tqh_first }

#define	TAILQ_ENTRY(type)						\
struct {								\
	struct type *tqe_next;	/* next element */			\
	struct type **tqe_prev;	/* address of previous next element */	\
	TRACEBUF							\
}

/*
 * Tail queue functions.
 */
#define	TAILQ_CONCAT(head1, head2, field) do {				\
	if (!TAILQ_EMPTY(head2)) {					\
		*(head1)->tqh_last =3D (head2)->tqh_first;		\
		(head2)->tqh_first->field.tqe_prev =3D (head1)->tqh_last;	\
		(head1)->tqh_last =3D (head2)->tqh_last;			\
		TAILQ_INIT((head2));					\
		QMD_TRACE_HEAD(head);					\
		QMD_TRACE_HEAD(head2);					\
	}								\
} while (0)

#define	TAILQ_EMPTY(head)	((head)->tqh_first =3D=3D NULL)

#define	TAILQ_FIRST(head)	((head)->tqh_first)

#define	TAILQ_FOREACH(var, head, field)					\
	for ((var) =3D TAILQ_FIRST((head));				\
	    (var);							\
	    (var) =3D TAILQ_NEXT((var), field))

#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
	for ((var) =3D TAILQ_FIRST((head));				\
	    (var) && ((tvar) =3D TAILQ_NEXT((var), field), 1);		\
	    (var) =3D (tvar))

#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
	for ((var) =3D TAILQ_LAST((head), headname);			\
	    (var);							\
	    (var) =3D TAILQ_PREV((var), headname, field))

#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
	for ((var) =3D TAILQ_LAST((head), headname);			\
	    (var) && ((tvar) =3D TAILQ_PREV((var), headname, field), 1);	\
	    (var) =3D (tvar))

#define	TAILQ_INIT(head) do {						\
	TAILQ_FIRST((head)) =3D NULL;					\
	(head)->tqh_last =3D &TAILQ_FIRST((head));			\
	QMD_TRACE_HEAD(head);						\
} while (0)

#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
	if ((TAILQ_NEXT((elm), field) =3D TAILQ_NEXT((listelm), field)) !=3D NUL=
L)\
		TAILQ_NEXT((elm), field)->field.tqe_prev =3D 		\
		    &TAILQ_NEXT((elm), field);				\
	else {								\
		(head)->tqh_last =3D &TAILQ_NEXT((elm), field);		\
		QMD_TRACE_HEAD(head);					\
	}								\
	TAILQ_NEXT((listelm), field) =3D (elm);				\
	(elm)->field.tqe_prev =3D &TAILQ_NEXT((listelm), field);		\
	QMD_TRACE_ELEM(&(elm)->field);					\
	QMD_TRACE_ELEM(&listelm->field);				\
} while (0)

#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
	(elm)->field.tqe_prev =3D (listelm)->field.tqe_prev;		\
	TAILQ_NEXT((elm), field) =3D (listelm);				\
	*(listelm)->field.tqe_prev =3D (elm);				\
	(listelm)->field.tqe_prev =3D &TAILQ_NEXT((elm), field);		\
	QMD_TRACE_ELEM(&(elm)->field);					\
	QMD_TRACE_ELEM(&listelm->field);				\
} while (0)

#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
	if ((TAILQ_NEXT((elm), field) =3D TAILQ_FIRST((head))) !=3D NULL)	\
		TAILQ_FIRST((head))->field.tqe_prev =3D			\
		    &TAILQ_NEXT((elm), field);				\
	else								\
		(head)->tqh_last =3D &TAILQ_NEXT((elm), field);		\
	TAILQ_FIRST((head)) =3D (elm);					\
	(elm)->field.tqe_prev =3D &TAILQ_FIRST((head));			\
	QMD_TRACE_HEAD(head);						\
	QMD_TRACE_ELEM(&(elm)->field);					\
} while (0)

#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
	TAILQ_NEXT((elm), field) =3D NULL;				\
	(elm)->field.tqe_prev =3D (head)->tqh_last;			\
	*(head)->tqh_last =3D (elm);					\
	(head)->tqh_last =3D &TAILQ_NEXT((elm), field);			\
	QMD_TRACE_HEAD(head);						\
	QMD_TRACE_ELEM(&(elm)->field);					\
} while (0)

#define	TAILQ_LAST(head, headname)					\
	(*(((struct headname *)((head)->tqh_last))->tqh_last))

#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)

#define	TAILQ_PREV(elm, headname, field)				\
	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))

#define	TAILQ_REMOVE(head, elm, field) do {				\
	if ((TAILQ_NEXT((elm), field)) !=3D NULL)				\
		TAILQ_NEXT((elm), field)->field.tqe_prev =3D 		\
		    (elm)->field.tqe_prev;				\
	else {								\
		(head)->tqh_last =3D (elm)->field.tqe_prev;		\
		QMD_TRACE_HEAD(head);					\
	}								\
	*(elm)->field.tqe_prev =3D TAILQ_NEXT((elm), field);		\
	TRASHIT((elm)->field.tqe_next);					\
	TRASHIT((elm)->field.tqe_prev);					\
	QMD_TRACE_ELEM(&(elm)->field);					\
} while (0)


#ifdef _KERNEL

/*
 * XXX insque() and remque() are an old way of handling certain queues.
 * They bogusly assumes that all queue heads look alike.
 */

struct quehead {
	struct quehead *qh_link;
	struct quehead *qh_rlink;
};

#if defined(__GNUC__) || defined(__INTEL_COMPILER)

static __inline void
insque(void *a, void *b)
{
	struct quehead *element =3D (struct quehead *)a,
		 *head =3D (struct quehead *)b;

	element->qh_link =3D head->qh_link;
	element->qh_rlink =3D head;
	head->qh_link =3D element;
	element->qh_link->qh_rlink =3D element;
}

static __inline void
remque(void *a)
{
	struct quehead *element =3D (struct quehead *)a;

	element->qh_link->qh_rlink =3D element->qh_rlink;
	element->qh_rlink->qh_link =3D element->qh_link;
	element->qh_rlink =3D 0;
}

#else /* !(__GNUC__ || __INTEL_COMPILER) */

void	insque(void *a, void *b);
void	remque(void *a);

#endif /* __GNUC__ || __INTEL_COMPILER */

#endif /* _KERNEL */

#endif /* !_SYS_QUEUE_H_ */

--------------000603080608000406060702
Content-Type: text/plain; charset=windows-1251;
 name="queue.h.rej"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="queue.h.rej"

***************
*** 28,44 ****
   *
   *	@(#)queue.h	8.5 (Berkeley) 8/20/94
   * $FreeBSD: head/www/firefox/files/patch-bug807492 310207 2013-01-10 2=
2:29:23Z flo $
   */
 =20
  #ifndef _SYS_QUEUE_H_
  #define	_SYS_QUEUE_H_
 =20
- #ifndef DARWIN
  #include <stddef.h>
  #define __offsetof offsetof
  #endif
 =20
  #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                    =
 \
           for ((var) =3D STAILQ_FIRST((head));                          =
    \
               (var) && ((tvar) =3D STAILQ_NEXT((var), field), 1);       =
    \
               (var) =3D (tvar))
--- 28,44 ----
   *
   *	@(#)queue.h	8.5 (Berkeley) 8/20/94
   * $FreeBSD: head/www/firefox/files/patch-bug807492 310207 2013-01-10 2=
2:29:23Z flo $
   */
 =20
  #ifndef _SYS_QUEUE_H_
  #define	_SYS_QUEUE_H_
 =20
+ #if !defined(BSD) && !defined(DARWIN)
  #include <stddef.h>
  #define __offsetof offsetof
  #endif
 =20
  #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                    =
 \
           for ((var) =3D STAILQ_FIRST((head));                          =
    \
               (var) && ((tvar) =3D STAILQ_NEXT((var), field), 1);       =
    \
               (var) =3D (tvar))

--------------000603080608000406060702--

------enig2NBADNRCEJSMJVVDMAPXX
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (MingW32)

iEYEARECAAYFAlDvstoACgkQVg5YK5ZEdN0pewCeMWFnN9QeTR9h8vIgy0WW5dFT
s7UAn3oTHEqGg+6+6EbzahC1AyIJLldv
=sut9
-----END PGP SIGNATURE-----

------enig2NBADNRCEJSMJVVDMAPXX--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50EFB2DA.60309>