Bug 916589 - Rename __offsetof() to avoid conflict with platform-specific definition. r=docfaraday

This commit is contained in:
Jan Beich 2013-09-15 10:47:00 +02:00
parent ba4ef49451
commit 0740628072

View File

@ -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)