From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15355 invoked by alias); 9 Mar 2010 23:50:18 -0000 Received: (qmail 15346 invoked by uid 22791); 9 Mar 2010 23:50:16 -0000 X-SWARE-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,MSGID_MULTIPLE_AT X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.151) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 09 Mar 2010 23:50:11 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.2/jtpda-5.5pre1) with ESMTP id o29No74v084198 for ; Wed, 10 Mar 2010 00:50:07 +0100 (CET) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from mailserver.u-strasbg.fr (ms3.u-strasbg.fr [IPv6:2001:660:2402:d::12]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id o29No7HY026190 for ; Wed, 10 Mar 2010 00:50:07 +0100 (CET) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from d620muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id o29No616054858 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) for ; Wed, 10 Mar 2010 00:50:06 +0100 (CET) (envelope-from pierre.muller@ics-cnrs.unistra.fr) From: "Pierre Muller" To: References: <000901cabeda$3cd7bd00$b6873700$@muller@ics-cnrs.unistra.fr> <20100308200858.GA28304@caradoc.them.org> <20100308214856.GA18247@ednor.casa.cgf.cx> <000f01cabf16$07402330$15c06990$@muller@ics-cnrs.unistra.fr> <20100309191512.GB2977@ednor.casa.cgf.cx> In-Reply-To: <20100309191512.GB2977@ednor.casa.cgf.cx> Subject: RE: [RFA] Fix remote-fileio.c compilation for Cygwin 1.5 API Date: Tue, 09 Mar 2010 23:50:00 -0000 Message-ID: <000901cabfe3$43c6bda0$cb5438e0$@muller@ics-cnrs.unistra.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2010-03/txt/msg00375.txt.bz2 Hi Christopher, > >I just discovered for windows-nat.c > > > >See http://sourceware.org/ml/gdb-patches/2010-03/msg00344.html > > You're right. My macro was too simple minded. I've checked in your > change to windows-nat.c. If you want to use that in remote-fileio.c > that's fine. Or not. It really isn't a big deal either way. Thanks for the check-in. OK, here is a new, lighter version of the remote-fileio.c patch... There is also a small problem remaining for windows-nat.c (the previous definition of the cygwin_conv_path macro needs to be removed). Is this patch OK? Pierre 2010-03-10 Pierre Muller * remote-fileio.c (cygwin_conv_path): Define macro for old cygwin API. * windows-nat.c (cygwin_conv_path): Remove old macro. Index: remote-fileio.c =================================================================== RCS file: /cvs/src/src/gdb/remote-fileio.c,v retrieving revision 1.34 diff -u -p -r1.34 remote-fileio.c --- remote-fileio.c 1 Mar 2010 09:09:24 -0000 1.34 +++ remote-fileio.c 9 Mar 2010 23:45:48 -0000 @@ -35,6 +35,15 @@ #include #ifdef __CYGWIN__ #include /* For cygwin_conv_to_full_posix_path. */ +#include +#if CYGWIN_VERSION_DLL_MAKE_COMBINED(CYGWIN_VERSION_API_MAJOR,CYGWIN_VERSION_API _MINOR) < 181 +# define CCP_POSIX_TO_WIN_A 0 +# define CCP_WIN_A_TO_POSIX 2 +# define cygwin_conv_path(op, from, to, size) \ + (op == CCP_WIN_A_TO_POSIX) ? \ + cygwin_conv_to_full_posix_path (from, to) : \ + cygwin_conv_to_win32_path (from, to) +#endif #endif #include Index: windows-nat.c =================================================================== RCS file: /cvs/src/src/gdb/windows-nat.c,v retrieving revision 1.206 diff -u -p -r1.206 windows-nat.c --- windows-nat.c 9 Mar 2010 19:10:39 -0000 1.206 +++ windows-nat.c 9 Mar 2010 23:45:49 -0000 @@ -121,7 +121,6 @@ static struct target_ops windows_ops; (op == CCP_WIN_W_TO_POSIX) ? \ cygwin_conv_to_full_posix_path (from, to) : \ cygwin_conv_to_win32_path (from, to) -# define cygwin_conv_path(op, from, to, size) cygwin_conv_to_full_posix_path (from, to) typedef char cygwin_buf_t; static DWORD WINAPI (*GetModuleFileNameEx) (HANDLE, HMODULE, LPSTR, DWORD); # define STARTUPINFO STARTUPINFOA