[pkgsrc/trunk]: pkgsrc Update pkgtools/libnbcompat to 20030825. Changes from...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4b592d6367e
branches:  trunk
changeset: 460710:c4b592d6367e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Sep 03 07:07:04 2003 +0000

description:
Update pkgtools/libnbcompat to 20030825.  Changes from version 20030824
are moving the definitions of the TAILQ accessor methods into the top level
of nbcompat.h.  This should fix using nbcompat.h to replace sys/queue.h
on Linux systems.

diffstat:

 doc/CHANGES                           |   3 ++-
 pkgtools/libnbcompat/Makefile         |   4 ++--
 pkgtools/libnbcompat/files/nbcompat.h |  16 +++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (71 lines):

diff -r 47befa355e57 -r c4b592d6367e doc/CHANGES
--- a/doc/CHANGES       Wed Sep 03 06:16:08 2003 +0000
+++ b/doc/CHANGES       Wed Sep 03 07:07:04 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3216 2003/09/03 05:39:22 martti Exp $
+$NetBSD: CHANGES,v 1.3217 2003/09/03 07:07:04 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3491,3 +3491,4 @@
        Updated subversion to 0.28.2 [epg 2003-09-02]
        Updated libnbcompat to 20030824 [jlam 2003-09-02]
        Updated doxygen to 1.3.3 [martti 2003-09-03]
+       Updated libnbcompat to 20030825 [jlam 2003-09-03]
diff -r 47befa355e57 -r c4b592d6367e pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile     Wed Sep 03 06:16:08 2003 +0000
+++ b/pkgtools/libnbcompat/Makefile     Wed Sep 03 07:07:04 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2003/09/03 03:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/03 07:07:04 jlam Exp $
 #
 
-DISTNAME=              libnbcompat-20030824
+DISTNAME=              libnbcompat-20030825
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r 47befa355e57 -r c4b592d6367e pkgtools/libnbcompat/files/nbcompat.h
--- a/pkgtools/libnbcompat/files/nbcompat.h     Wed Sep 03 06:16:08 2003 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat.h     Wed Sep 03 07:07:04 2003 +0000
@@ -103,16 +103,14 @@
 #define        LIST_INIT(head) do {                                            \
        (head)->lh_first = NULL;                                        \
 } while (/*CONSTCOND*/0)
-#endif
+#endif /* HAVE_SYS_QUEUE_H */
 
 #ifndef LIST_EMPTY
 #define        LIST_EMPTY(head)                ((head)->lh_first == NULL)
 #endif
-
 #ifndef LIST_FIRST
 #define        LIST_FIRST(head)                ((head)->lh_first)
 #endif
-
 #ifndef LIST_NEXT
 #define        LIST_NEXT(elm, field)           ((elm)->field.le_next)
 #endif
@@ -165,14 +163,18 @@
                (head)->tqh_last = (elm)->field.tqe_prev;               \
        *(elm)->field.tqe_prev = (elm)->field.tqe_next;                 \
 } while (/*CONSTCOND*/0)
+#endif /* HAVE_SYS_QUEUE_H */
 
-/*
- * Tail queue access methods.
- */
+#ifndef TAILQ_EMPTY
 #define        TAILQ_EMPTY(head)               ((head)->tqh_first == NULL)
+#endif
+#ifndef TAILQ_FIRST
 #define        TAILQ_FIRST(head)               ((head)->tqh_first)
+#endif
+#ifndef TAILQ_NEXT
 #define        TAILQ_NEXT(elm, field)          ((elm)->field.tqe_next)
-
+#endif
+#ifndef TAILQ_FOREACH
 #define TAILQ_FOREACH(var, head, field)                                        \
        for ((var) = ((head)->tqh_first);                               \
                (var);                                                  \