diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-06-26 22:10:46 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-06-26 22:10:46 +0000 |
| commit | 8b94264115f1a95f95470e83e188e3e1ec7be499 (patch) | |
| tree | fe38c5ea119c63e73eecef3421a827aef0c9bbf1 /pkgtools/libnbcompat | |
| parent | ac78f7bf13460c84e28acca65366ea6bd6c26787 (diff) | |
| download | pkgsrc-8b94264115f1a95f95470e83e188e3e1ec7be499.tar.gz | |
Protect TAILQ_INSERT_{AFTER,BEFORE} from being redefined. Lets
pbulk build on netbsd-2/alpha (and probably other netbsd platforms)
again.
Diffstat (limited to 'pkgtools/libnbcompat')
| -rw-r--r-- | pkgtools/libnbcompat/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat/queue.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile index b11514a6b30..8b8005b3e3d 100644 --- a/pkgtools/libnbcompat/Makefile +++ b/pkgtools/libnbcompat/Makefile @@ -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 --git a/pkgtools/libnbcompat/files/nbcompat/queue.h b/pkgtools/libnbcompat/files/nbcompat/queue.h index 16f7677ffe0..0ae242836b3 100644 --- a/pkgtools/libnbcompat/files/nbcompat/queue.h +++ b/pkgtools/libnbcompat/files/nbcompat/queue.h @@ -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 @@ struct { \ } 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 @@ struct { \ (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 { \ |