X-Original-To: alpine-aports@lists.alpinelinux.org Received: from sender153-mail.zoho.com (sender153-mail.zoho.com [74.201.84.153]) by lists.alpinelinux.org (Postfix) with ESMTP id DE4DD5C07CC for ; Tue, 22 Nov 2016 21:45:03 +0000 (GMT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=zapps768; d=zoho.com; h=from:to:cc:subject:date:message-id; b=QgoNXnuCbx67t8jN8cPlY0k5hRYAXOmi8DlR0SP/T52r4nXBL2ls1QhKd/BUxZjMVBVClHpboCcW 7saCYCtdUoo3J5s5NEHveI/ecERjYbB7xtEVjkNfCEVUIppW08F8 Received: from localhost (89-74-198-11.dynamic.chello.pl [89.74.198.11]) by mx.zohomail.com with SMTPS id 147985109218775.85787984023807; Tue, 22 Nov 2016 13:44:52 -0800 (PST) From: Przemyslaw Pawelczyk To: ncopa@alpinelinux.org Cc: alpine-aports@lists.alpinelinux.org, timo.teras@iki.fi Subject: [alpine-aports] [PATCH] main/libc-dev: Update sys/queue.h from NetBSD sources and bump ver. Date: Tue, 22 Nov 2016 22:44:31 +0100 Message-Id: <20161122214431.21735-1-przemoc@zoho.com> X-Mailer: git-send-email 2.8.3 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Apply recent changes done by Christos Zoulas . http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/sys/queue.h?rev=1.70 * Revision 1.69, Mon Nov 2 14:49:07 2015 UTC by christos: Use existing macros to implement TAILQ_FOREACH_REVERSE, like TAILQ_FOREACH_REVERSE_SAFE does. * Revision 1.70, Mon Nov 2 15:21:23 2015 UTC by christos: Add missing paren. --- main/libc-dev/APKBUILD | 10 +++++----- main/libc-dev/sys-queue.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main/libc-dev/APKBUILD b/main/libc-dev/APKBUILD index 849bd71bfe2b..f639589560fb 100644 --- a/main/libc-dev/APKBUILD +++ b/main/libc-dev/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa # Maintainer: Natanael Copa pkgname=libc-dev -pkgver=0.7 -pkgrel=1 +pkgver=0.7.1 +pkgrel=0 pkgdesc="Meta package to pull in correct libc" url="http://alpinelinux.org" arch="noarch" @@ -53,11 +53,11 @@ bsdcompat() { } md5sums="5b125c4b64aef6d89766f657709cf0e4 sys-cdefs.h -c2784afaed83839546ba733e8a0435c7 sys-queue.h +9a3f0035d89763e26ceee03235fd5d93 sys-queue.h 8d0bcd3f4b10dfc5c74d5bb4c0d6722b sys-tree.h" sha256sums="30bb6d7e0e0b61fcd95d830c376c829a614bce4683c1b97e06c201ec2c6e839a sys-cdefs.h -3659cd137c320991a78413dd370a92fd18e0a8bc36d017d554f08677a37d7d5a sys-queue.h +c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b sys-queue.h e1e498a79bf160a5766fa560f2b07b206fe89fe21a62600c77d72e00a6992f92 sys-tree.h" sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h -19cec4d39310285eb49ad1beae86884080e0152f9477757513050211b31f95ee7283a64ae95939683df09231cfb021ace816b26981ad05f4fff0a39519f935fe sys-queue.h +2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h 07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/main/libc-dev/sys-queue.h b/main/libc-dev/sys-queue.h index 99d01a55b109..a38499a2673d 100644 --- a/main/libc-dev/sys-queue.h +++ b/main/libc-dev/sys-queue.h @@ -1,4 +1,4 @@ -/* $NetBSD: queue.h,v 1.68 2014/11/19 08:10:01 uebayasi Exp $ */ +/* $NetBSD: queue.h,v 1.70 2015/11/02 15:21:23 christos Exp $ */ /* * Copyright (c) 1991, 1993 @@ -421,9 +421,9 @@ struct { \ #define TAILQ_END(head) (NULL) #define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) #define TAILQ_LAST(head, headname) \ - (*(((struct headname *)((head)->tqh_last))->tqh_last)) + (*(((struct headname *)(void *)((head)->tqh_last))->tqh_last)) #define TAILQ_PREV(elm, headname, field) \ - (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) + (*(((struct headname *)(void *)((elm)->field.tqe_prev))->tqh_last)) #define TAILQ_EMPTY(head) (TAILQ_FIRST(head) == TAILQ_END(head)) @@ -438,9 +438,9 @@ struct { \ ((next) = TAILQ_NEXT(var, field), 1); (var) = (next)) #define TAILQ_FOREACH_REVERSE(var, head, headname, field) \ - for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));\ + for ((var) = TAILQ_LAST((head), headname); \ (var) != TAILQ_END(head); \ - (var) = (*(((struct headname *)((var)->field.tqe_prev))->tqh_last))) + (var) = TAILQ_PREV((var), headname, field)) #define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, prev) \ for ((var) = TAILQ_LAST((head), headname); \ -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---