Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: "Pierre Muller" <pierre.muller@ics-cnrs.unistra.fr>
To: <gdb-patches@sourceware.org>
Subject: RE: [RFA] Fix remote-fileio.c compilation for Cygwin 1.5 API
Date: Tue, 09 Mar 2010 23:50:00 -0000	[thread overview]
Message-ID: <000901cabfe3$43c6bda0$cb5438e0$@muller@ics-cnrs.unistra.fr> (raw)
In-Reply-To: <20100309191512.GB2977@ednor.casa.cgf.cx>

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  <muller@ics.u-strasbg.fr>

	* 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 <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
 #endif
 #include <signal.h>
 
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


  reply	other threads:[~2010-03-09 23:50 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-08 16:13 Pierre Muller
2010-03-08 20:09 ` Daniel Jacobowitz
2010-03-08 21:49   ` Christopher Faylor
2010-03-08 21:55     ` Daniel Jacobowitz
2010-03-08 23:21     ` Pierre Muller
2010-03-09 19:15       ` Christopher Faylor
2010-03-09 23:50         ` Pierre Muller [this message]
2010-03-10 15:57           ` Christopher Faylor
2010-03-10 16:42             ` Pierre Muller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='000901cabfe3$43c6bda0$cb5438e0$@muller@ics-cnrs.unistra.fr' \
    --to=pierre.muller@ics-cnrs.unistra.fr \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox