From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18237 invoked by alias); 29 Aug 2009 20:26:01 -0000 Received: (qmail 18221 invoked by uid 22791); 29 Aug 2009 20:26:00 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,MISSING_HEADERS X-Spam-Check-By: sourceware.org Received: from mtaout03-winn.ispmail.ntl.com (HELO mtaout03-winn.ispmail.ntl.com) (81.103.221.49) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 29 Aug 2009 20:25:55 +0000 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout03-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20090829202552.ODBA5579.mtaout03-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com>; Sat, 29 Aug 2009 21:25:52 +0100 Received: from cog.dallaway.org.uk ([86.9.207.237]) by aamtaout03-winn.ispmail.ntl.com (InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id <20090829202552.OGJC2093.aamtaout03-winn.ispmail.ntl.com@cog.dallaway.org.uk>; Sat, 29 Aug 2009 21:25:52 +0100 Received: from cog.dallaway.org.uk (cog.dallaway.org.uk [127.0.0.1]) by cog.dallaway.org.uk (8.13.8/8.13.8) with ESMTP id n7TKPkvD025481; Sat, 29 Aug 2009 21:25:46 +0100 Message-ID: <4A998ECA.5050200@dallaway.org.uk> Date: Sat, 29 Aug 2009 20:26:00 -0000 From: John Dallaway User-Agent: Thunderbird 2.0.0.22 (X11/20090625) MIME-Version: 1.0 CC: Uwe Kindler , ecos-devel@sourceware.org Subject: Re: uSTL config.h clash References: <4A995E22.9010606@web.de> <4A9984BA.7040705@dallaway.org.uk> In-Reply-To: <4A9984BA.7040705@dallaway.org.uk> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Mailing-List: contact ecos-devel-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: ecos-devel-owner@ecos.sourceware.org X-SW-Source: 2009-08/txt/msg00053.txt.bz2 Hi Uwe John Dallaway wrote: > Uwe Kindler wrote: > >> if I move the all uSTL headers except of ustl.h into an ustl >> subdirectory, then I need to touch almost all include directives in the >> ustl header and source files. I.e. in unew.c I would replace #include >> "unew.h" by #include "ustl/unew.h". Did I understand this right? > > I've just taken a quick look at the sources. It is indeed unfortunate > that the #includes in the various header files do not specify the ustl/ > subdirectory like ustl.h does in the upstream sources. The quick fix > here is to rename config.h to something like ustlcfg.h as you suggest. > But I'm concerned that other conflicts may arise in the future. > > Why does the original author make a distinction between include paths in > ustl.h and in the other ustl header files? To answer my own question, I now note that the original code uses a ustl/ symlink. I think the correct long-term approach for eCos is to move the header files (other than ustl.h) into include/ustl/ and to modify the source code accordingly. This will involve changes to many files but the changes are trivial and can be applied using a simple substitution so this should not impact future code imports much. If you agree with this approach, I will make the changes. John Dallaway