From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18062 invoked by alias); 6 Apr 2011 22:58:23 -0000 Received: (qmail 18044 invoked by uid 22791); 6 Apr 2011 22:58:21 -0000 X-SWARE-Spam-Status: No, hits=-0.6 required=5.0 tests=AWL,BAYES_05,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; Wed, 06 Apr 2011 22:58:16 +0000 Received: from md2.u-strasbg.fr (md2.u-strasbg.fr [IPv6:2001:660:2402::187]) by mailhost.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id p36MwDg9092461 for ; Thu, 7 Apr 2011 00:58:13 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from mailserver.u-strasbg.fr (ms1.u-strasbg.fr [130.79.204.10]) by md2.u-strasbg.fr (8.14.4/jtpda-5.5pre1) with ESMTP id p36MwDqP018748 for ; Thu, 7 Apr 2011 00:58:13 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) Received: from E6510Muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.4/jtpda-5.5pre1) with ESMTP id p36MwCJA052480 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Thu, 7 Apr 2011 00:58:13 +0200 (CEST) (envelope-from pierre.muller@ics-cnrs.unistra.fr) From: "Pierre Muller" To: Subject: [RFA 1/2] Remove old Cygwin1.5 support Date: Wed, 06 Apr 2011 22:58:00 -0000 Message-ID: <004e01cbf4ae$1cea8710$56bf9530$@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: 2011-04/txt/msg00101.txt.bz2 As Christopher Faylor told me that my previous patch series was much too bulky compared to the added value, I will try to split it in little parts. The first two patches concern the removal of Cygwin 1.5 support has he suggested. This allows some simplifications in windows-nat.c code and I will try to further reduce cygwin/mingw differences in subsequent patches. This first part just removes the macros that are used to support Cygwin 1.5 in remote-fileio.c and windows-nat.c The second part updates gdbserver/win32-low.c to use the new cygwin_conv_path and cygwin_conv_path_list functions in order to avoid build failure due to deprecated warning. Does anyone object to the idea of removing old Cygwin support? Christopher, is this patch acceptable as is? Pierre Muller. 2011-04-07 Pierre Muller Remove support for old Cygwin 1.5 versions. * remote-fileio.c: Remove macros used to emulate new cygwin_conv_path function on old Cygwin version. * windows-nat.c: Remove cygwin version check and always define __USEWIDE for Cygwin compilation. diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index 68298e7..d840c56 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -36,16 +36,7 @@ #include #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 +#include /* For cygwin_conv_path. */ #endif #include diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 4334755..350f8d8 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -41,7 +41,6 @@ #include #ifdef __CYGWIN__ #include -#include #endif #include @@ -112,7 +111,6 @@ static struct target_ops windows_ops; /* The starting and ending address of the cygwin1.dll text segment. */ static CORE_ADDR cygwin_load_start; static CORE_ADDR cygwin_load_end; -# if CYGWIN_VERSION_DLL_MAKE_COMBINED(CYGWIN_VERSION_API_MAJOR,CYGWIN_VERSION_API _MINOR) >= 181 # define __USEWIDE typedef wchar_t cygwin_buf_t; static DWORD WINAPI (*GetModuleFileNameEx) (HANDLE, HMODULE, @@ -121,21 +119,6 @@ static struct target_ops windows_ops; # define CreateProcess CreateProcessW # define GetModuleFileNameEx_name "GetModuleFileNameExW" # define bad_GetModuleFileNameEx bad_GetModuleFileNameExW -# else -# define CCP_POSIX_TO_WIN_W 1 -# define CCP_WIN_W_TO_POSIX 3 -# define cygwin_conv_path(op, from, to, size) \ - (op == CCP_WIN_W_TO_POSIX) ? \ - cygwin_conv_to_full_posix_path (from, to) : \ - cygwin_conv_to_win32_path (from, to) - typedef char cygwin_buf_t; - static DWORD WINAPI (*GetModuleFileNameEx) (HANDLE, HMODULE, LPSTR, DWORD); -# define STARTUPINFO STARTUPINFOA -# define CreateProcess CreateProcessA -# define GetModuleFileNameEx_name "GetModuleFileNameExA" -# define bad_GetModuleFileNameEx bad_GetModuleFileNameExA -# define CW_SET_DOS_FILE_WARNING -1 /* no-op this for older Cygwin */ -# endif #endif static int have_saved_context; /* True if we've saved context from a