Commit 5b485c69 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

use offsetof directly

parent 7a2d7521
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* top-level directory of the distribution. * top-level directory of the distribution.
*/ */
/* stolen from FreeBSD for use in OpenLDAP */ /* stolen from FreeBSD for use in OpenLDAP */
/* $OpenLDAP$ */
/* /*
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
...@@ -48,8 +49,6 @@ ...@@ -48,8 +49,6 @@
#ifndef _SYS_QUEUE_H_ #ifndef _SYS_QUEUE_H_
#define _SYS_QUEUE_H_ #define _SYS_QUEUE_H_
#define __offsetof offsetof
/* /*
* This file defines five types of data structures: singly-linked lists, * This file defines five types of data structures: singly-linked lists,
* singly-linked tail queues, lists, tail queues, and circular queues. * singly-linked tail queues, lists, tail queues, and circular queues.
...@@ -119,6 +118,9 @@ ...@@ -119,6 +118,9 @@
* _REMOVE + + + + + * _REMOVE + + + + +
* *
*/ */
/*
* see queue(3) for instructions on how to use
*/
/* /*
* Singly-linked List definitions. * Singly-linked List definitions.
...@@ -212,7 +214,7 @@ struct { \ ...@@ -212,7 +214,7 @@ struct { \
(STAILQ_EMPTY(head) ? \ (STAILQ_EMPTY(head) ? \
NULL : \ NULL : \
((struct type *) \ ((struct type *) \
((char *)((head)->stqh_last) - __offsetof(struct type, field)))) ((char *)((head)->stqh_last) - offsetof(struct type, field))))
#define STAILQ_FOREACH(var, head, field) \ #define STAILQ_FOREACH(var, head, field) \
for((var) = (head)->stqh_first; (var); (var) = (var)->field.stqe_next) for((var) = (head)->stqh_first; (var); (var) = (var)->field.stqe_next)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment