Mailing-List: contact cygwin-developers-help AT cygwin DOT com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-developers-owner AT cygwin DOT com Delivered-To: mailing list cygwin-developers AT cygwin DOT com Date: Fri, 20 Sep 2002 16:30:29 -0400 From: Christopher Faylor To: cygwin-developers AT cygwin DOT com Subject: Re: Issue with cygwin_daemon merge Message-ID: <20020920203029.GA29020@redhat.com> Reply-To: cygwin-developers AT cygwin DOT com Mail-Followup-To: cygwin-developers AT cygwin DOT com References: <00dd01c260e3$7dc35070$6132bc3e AT BABEL> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <00dd01c260e3$7dc35070$6132bc3e@BABEL> User-Agent: Mutt/1.4i On Fri, Sep 20, 2002 at 09:22:49PM +0100, Conrad Scott wrote: >I've been worried and confused about my proposed merge of the >cygwin_daemon branch, because some of the files in the branch have a >different name from those in HEAD: in particular, this applies to the >System V IPC header files (ipc.h, msg.h, etc.). > >In the branch these are in include/sys with the correct names, while in >HEAD they are in the main cygwin source directory with mangled names >(cygwin_ipc.h, etc.) -- this was done to avoid confusing configuration >scripts etc. that would otherwise have seen the headers. > >I've come to the conclusion that the best bet (i.e., what would make my >life easiest) is to have the files under the same names in both branch >and HEAD, but keep them out of the line-of-fire so that nothing finds by >mistake. The problem with the location used by HEAD is that they don't >end up in the installed directory areas and so make testing, even >locally, rather difficult. > >My suggestion is to put these headers in include/cygwin with the correct >names. Is the interface working in this merge? If so, then it seems like putting the files in sys is the way to go. Otherwise putting them in include/cygwin is ok. cgf