[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat Protect TAILQ_INSERT_{AFTER,BEFOR...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ca8bc33f8cb9
branches:  trunk
changeset: 530363:ca8bc33f8cb9
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Jun 26 22:10:46 2007 +0000

description:
Protect TAILQ_INSERT_{AFTER,BEFORE} from being redefined.  Lets
pbulk build on netbsd-2/alpha (and probably other netbsd platforms)
again.

diffstat:

 pkgtools/libnbcompat/Makefile               |  4 ++--
 pkgtools/libnbcompat/files/nbcompat/queue.h |  6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r e29ea842ca36 -r ca8bc33f8cb9 pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile     Tue Jun 26 17:24:10 2007 +0000
+++ b/pkgtools/libnbcompat/Makefile     Tue Jun 26 22:10:46 2007 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.50 2007/06/25 21:35:03 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2007/06/26 22:10:46 dmcmahill Exp $
 #
 # NOTE: If you update this package, it is *mandatory* that you update
 #      pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #      list of tested and supported platforms.
 #
 
-DISTNAME=              libnbcompat-20070622
+DISTNAME=              libnbcompat-20070626
 CATEGORIES=            pkgtools devel
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r e29ea842ca36 -r ca8bc33f8cb9 pkgtools/libnbcompat/files/nbcompat/queue.h
--- a/pkgtools/libnbcompat/files/nbcompat/queue.h       Tue Jun 26 17:24:10 2007 +0000
+++ b/pkgtools/libnbcompat/files/nbcompat/queue.h       Tue Jun 26 22:10:46 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: queue.h,v 1.3 2007/06/25 21:35:05 joerg Exp $  */
+/*     $NetBSD: queue.h,v 1.4 2007/06/26 22:10:46 dmcmahill Exp $      */
 
 /*
  * Copyright (c) 1991, 1993
@@ -260,6 +260,7 @@
 } while (/*CONSTCOND*/0)
 #endif
 
+#ifndef TAILQ_INSERT_AFTER
 #define        TAILQ_INSERT_AFTER(head, listelm, elm, field) do {              \
        if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
                (elm)->field.tqe_next->field.tqe_prev =                 \
@@ -269,13 +270,16 @@
        (listelm)->field.tqe_next = (elm);                              \
        (elm)->field.tqe_prev = &(listelm)->field.tqe_next;             \
 } while (/*CONSTCOND*/0)
+#endif
 
+#ifndef TAILQ_INSERT_BEFORE
 #define        TAILQ_INSERT_BEFORE(listelm, elm, field) do {                   \
        (elm)->field.tqe_prev = (listelm)->field.tqe_prev;              \
        (elm)->field.tqe_next = (listelm);                              \
        *(listelm)->field.tqe_prev = (elm);                             \
        (listelm)->field.tqe_prev = &(elm)->field.tqe_next;             \
 } while (/*CONSTCOND*/0)
+#endif
 
 #ifndef TAILQ_REMOVE
 #define TAILQ_REMOVE(head, elm, field) do {                            \