From c6ca3dab4a071afab5d1efe8c82ed7972062fde0 Mon Sep 17 00:00:00 2001
From: Pierre Muller <muller@sourceware.org>
Date: Thu, 7 Apr 2011 22:24:17 +0000
Subject: [PATCH] 	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.

---
 gdb/ChangeLog       |  8 ++++++++
 gdb/remote-fileio.c | 11 +----------
 gdb/windows-nat.c   | 17 -----------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f6050a95ad1..edb8b70372b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 
 	* arm-linux-tdep.c (arm_linux_copy_svc): Remove parameters INSN
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 68298e78628..d840c56bd61 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 4334755fee1..350f8d881fc 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
-- 
2.30.2