about summary refs log tree commit homepage
path: root/bsd
diff options
context:
space:
mode:
Diffstat (limited to 'bsd')
-rw-r--r--bsd/queue_safe.h43
-rw-r--r--bsd/simpleq.h10
2 files changed, 0 insertions, 53 deletions
diff --git a/bsd/queue_safe.h b/bsd/queue_safe.h
deleted file mode 100644
index 7b5cbfd..0000000
--- a/bsd/queue_safe.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * this file adds *_SAFE macros that may be missing from the stock
- * sys/queue.h header.  The original (BSD) license terms are
- * retained (see below).
- */
-#include <sys/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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- */
-#ifndef LIST_FOREACH_SAFE
-#define        LIST_FOREACH_SAFE(var, head, field, tvar)                        \
-        for ((var) = LIST_FIRST((head));                                \
-            (var) && ((tvar) = LIST_NEXT((var), field), 1);                \
-            (var) = (tvar))
-#endif /* LIST_FOREACH_SAFE */
-
-/* add more as we need them */
diff --git a/bsd/simpleq.h b/bsd/simpleq.h
index bce207c..a0b4d99 100644
--- a/bsd/simpleq.h
+++ b/bsd/simpleq.h
@@ -3,14 +3,6 @@
  * sys/queue.h header.  The original (BSD) license terms are
  * retained (see below).
  */
-#include <sys/queue.h>
-
-/*
- * Some systems have STAILQ instead of SIMPLEQ, and presumably
- * some have SIMPLEQ instead of STAILQ.  And of course some systems
- * have both..
- */
-#ifndef SIMPLEQ_HEAD
 
 /*-
  * Copyright (c) 1991, 1993
@@ -110,5 +102,3 @@ struct {                                                                \
 #define        SIMPLEQ_EMPTY(head)                ((head)->sqh_first == NULL)
 #define        SIMPLEQ_FIRST(head)                ((head)->sqh_first)
 #define        SIMPLEQ_NEXT(elm, field)        ((elm)->field.sqe_next)
-
-#endif /* missing SIMPLEQ* */