FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove support for old Cygwin 1.5 versions.

Browse source 
* 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.
This commit is contained in:
Pierre Muller 2011-04-07 22:24:17 +00:00
parent 5d8e6b4d11
commit c6ca3dab4a
3 changed files with 9 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2011-04-07 Pierre Muller <muller@ics.u-strasbg.fr>
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.
2011-04-07 Yao Qi <yao@codesourcery.com> 2011-04-07 Yao Qi <yao@codesourcery.com>
* arm-linux-tdep.c (arm_linux_copy_svc): Remove parameters INSN * arm-linux-tdep.c (arm_linux_copy_svc): Remove parameters INSN

11
gdb/remote-fileio.c
View file

@ -36,16 +36,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <sys/cygwin.h> /* For cygwin_conv_to_full_posix_path. */ #include <sys/cygwin.h> /* For cygwin_conv_path. */
#include <cygwin/version.h>
#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 #endif
#include <signal.h> #include <signal.h>

17
gdb/windows-nat.c
View file

@ -41,7 +41,6 @@
#include <psapi.h> #include <psapi.h>
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <sys/cygwin.h> #include <sys/cygwin.h>
#include <cygwin/version.h>
#endif #endif
#include <signal.h> #include <signal.h>
@ -112,7 +111,6 @@ static struct target_ops windows_ops;
/* The starting and ending address of the cygwin1.dll text segment. */ /* The starting and ending address of the cygwin1.dll text segment. */
static CORE_ADDR cygwin_load_start; static CORE_ADDR cygwin_load_start;
static CORE_ADDR cygwin_load_end; static CORE_ADDR cygwin_load_end;
# if CYGWIN_VERSION_DLL_MAKE_COMBINED(CYGWIN_VERSION_API_MAJOR,CYGWIN_VERSION_API_MINOR) >= 181
# define __USEWIDE # define __USEWIDE
typedef wchar_t cygwin_buf_t; typedef wchar_t cygwin_buf_t;
static DWORD WINAPI (*GetModuleFileNameEx) (HANDLE, HMODULE, static DWORD WINAPI (*GetModuleFileNameEx) (HANDLE, HMODULE,
@ -121,21 +119,6 @@ static struct target_ops windows_ops;
# define CreateProcess CreateProcessW # define CreateProcess CreateProcessW
# define GetModuleFileNameEx_name "GetModuleFileNameExW" # define GetModuleFileNameEx_name "GetModuleFileNameExW"
# define bad_GetModuleFileNameEx bad_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 #endif
static int have_saved_context; /* True if we've saved context from a static int have_saved_context; /* True if we've saved context from a