diff options
| author | jlam <jlam> | 2003-09-03 07:07:04 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-09-03 07:07:04 +0000 |
| commit | 7eca9a12cd80b601631c8a594920134829fcc408 (patch) | |
| tree | dbef014c48d0c2e2be0b4ddc4fde74417b466cd2 /pkgtools | |
| parent | e9b53bb3d09f562ada102b5912be9ee42809291d (diff) | |
| download | pkgsrc-7eca9a12cd80b601631c8a594920134829fcc408.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/libnbcompat/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/libnbcompat/files/nbcompat.h | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgtools/libnbcompat/Makefile b/pkgtools/libnbcompat/Makefile index 5eae0ce064a..c9c5731e5d2 100644 --- a/pkgtools/libnbcompat/Makefile +++ b/pkgtools/libnbcompat/Makefile @@ -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 --git a/pkgtools/libnbcompat/files/nbcompat.h b/pkgtools/libnbcompat/files/nbcompat.h index 14bf4395da2..29def5890c2 100644 --- a/pkgtools/libnbcompat/files/nbcompat.h +++ b/pkgtools/libnbcompat/files/nbcompat.h @@ -103,16 +103,14 @@ struct { \ #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 @@ struct { \ (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); \ |