From owner-freebsd-hackers@FreeBSD.ORG Tue Jul 12 22:14:51 2005 Return-Path: X-Original-To: freebsd-hackers@freebsd.org Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 80BE716A41C for ; Tue, 12 Jul 2005 22:14:51 +0000 (GMT) (envelope-from keramida@freebsd.org) Received: from kane.otenet.gr (kane.otenet.gr [195.170.0.95]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9364543D46 for ; Tue, 12 Jul 2005 22:14:50 +0000 (GMT) (envelope-from keramida@freebsd.org) Received: from gothmog.gr (patr530-a178.otenet.gr [212.205.215.178]) by kane.otenet.gr (8.13.4/8.13.4/Debian-1) with ESMTP id j6CMEjwW025547; Wed, 13 Jul 2005 01:14:46 +0300 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.4/8.13.4) with ESMTP id j6CMEiBa001199; Wed, 13 Jul 2005 01:14:44 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from giorgos@localhost) by gothmog.gr (8.13.4/8.13.4/Submit) id j6CMEiJi001198; Wed, 13 Jul 2005 01:14:44 +0300 (EEST) (envelope-from keramida@freebsd.org) Date: Wed, 13 Jul 2005 01:14:44 +0300 From: Giorgos Keramidas To: Florent Thoumie Message-ID: <20050712221444.GA1180@gothmog.gr> References: <42D3E8D9.6020105@xbsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <42D3E8D9.6020105@xbsd.org> Cc: freebsd-hackers@freebsd.org Subject: Re: SIMPLEQ_* macros from OpenBSD sys/queue.h X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 22:14:51 -0000 On 2005-07-12 17:59, Florent Thoumie wrote: > I'm currently working on OpenBGPd port update and I'm facing a little > problem that is actually quite painful to deal with. > > I need some macros from OpenBSD sys/queue.h which aren't present in > FreeBSD. I can replace #include with #include "queue.h" > and copy the file in the working directory but this leads to having > more than 10 patches. > > Yeah I'm using REINPLACE_CMD, but sometimes sys/queue.h is a hidden > "dependency" (by hidden, I mean it's included by an included header > file, and doesn't show up directly in the source file). > > So, could somebody consider merging these SIMPLEQ_* macros or even > synchronize FreeBSD and OpenBSD versions ? OpenBSD tries to keep this header in sync with NetBSD, AFAICT from the cvs logs in their tree. I have the queue.h headers from all three on my disk and I'm already looking at the differences, so if you don't mind waiting 1-2 days so that I can run any changes through a buildworld I'll give it a try. If you have changes that depend on SIMPLEQ_* that could serve as a test case that you can share, it would be nice too :-) - Giorgos