From owner-svn-src-vendor@freebsd.org Sat May 26 07:39:11 2018 Return-Path: Delivered-To: svn-src-vendor@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9ADCF6B751; Sat, 26 May 2018 07:39:11 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 5AD3486188; Sat, 26 May 2018 07:39:11 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (115-166-25-190.dyn.iinet.net.au [115.166.25.190]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id w4Q7d6d0048951 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 26 May 2018 00:39:09 -0700 (PDT) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r334187 - vendor-sys/ck/dist/include To: Olivier Houchard , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org References: <201805242135.w4OLZqjr024647@repo.freebsd.org> From: Julian Elischer Message-ID: <18eacbc3-cb4c-49c0-189c-9d405a59b46f@freebsd.org> Date: Sat, 26 May 2018 15:39:00 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <201805242135.w4OLZqjr024647@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 May 2018 07:39:12 -0000 Would it not make more sense to simply use the real one instead? ck's queue.h is just a copy of a very old BSD queue.h. (or maybe from netbsd or something) As far as I can see it would probably have just worked. On 25/5/18 5:35 am, Olivier Houchard wrote: > Author: cognet > Date: Thu May 24 21:35:52 2018 > New Revision: 334187 > URL: https://svnweb.freebsd.org/changeset/base/334187 > > Log: > Import CK as of commit 0f017230ccc86929f56bf44ef2dca93d7df8076b. > This brings us the renaming of fields in ck_queue, so that our own > LIST/SLIST/TAILQ/etc won't accidentally work with them. > > Modified: > vendor-sys/ck/dist/include/ck_queue.h > > Modified: vendor-sys/ck/dist/include/ck_queue.h > ============================================================================== > --- vendor-sys/ck/dist/include/ck_queue.h Thu May 24 21:22:03 2018 (r334186) > +++ vendor-sys/ck/dist/include/ck_queue.h Thu May 24 21:35:52 2018 (r334187) > @@ -125,7 +125,7 @@ > */ > #define CK_SLIST_HEAD(name, type) \ > struct name { \ > - struct type *slh_first; /* first element */ \ > + struct type *cslh_first; /* first element */ \