[RFA 1/2] Remove old Cygwin1.5 support

[RFA 1/2] Remove old Cygwin1.5 support

[Pierre Muller]

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  <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.



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

Re: [RFA 1/2] Remove old Cygwin1.5 support

[Christopher Faylor]

On Thu, Apr 07, 2011 at 12:58:14AM +0200, Pierre Muller wrote:
>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  <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.

Looks good.  Please check in.  I can't approve the gdbserver patch since
I don't believe I have that privilege.

cgf

RE: [RFA 1/2] Remove old Cygwin1.5 support

[Pierre Muller]

> >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  <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.
> 
> Looks good.  Please check in.  

Thanks for the approval,
patch checked in.

> I can't approve the gdbserver patch since
> I don't believe I have that privilege.
Maybe Pedro can?
Patch is in:
http://sourceware.org/ml/gdb-patches/2011-04/msg00100.html

Pierre Muller