From: Jon Turney <jon.turney@dronecode.org.uk>
To: gdb-patches@sourceware.org
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 1/4] Fix Cygwin build after fcab5839
Date: Sat, 21 May 2022 12:10:54 +0100 [thread overview]
Message-ID: <20220521111057.13089-2-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20220521111057.13089-1-jon.turney@dronecode.org.uk>
Fix Cygwin build after fcab5839 ("Implement pid_to_exec_file for Windows
in gdbserver"). That change moves code from gdb/windows-nat.c to
gdb/nat/windows-nat.c, but doesn't add the required typedefs and
includes for parts of that code under ifdef __CYGWIN__.
---
gdb/nat/windows-nat.c | 9 ++++++++-
gdb/windows-nat.c | 3 ---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
index 71a18a0efa9..f6818015c53 100644
--- a/gdb/nat/windows-nat.c
+++ b/gdb/nat/windows-nat.c
@@ -21,8 +21,15 @@
#include "gdbsupport/common-debug.h"
#include "target/target.h"
-#ifdef __CYGWIN__
+#undef GetModuleFileNameEx
+
+#ifndef __CYGWIN__
+#define GetModuleFileNameEx GetModuleFileNameExA
+#else
+#include <sys/cygwin.h>
#define __USEWIDE
+typedef wchar_t cygwin_buf_t;
+#define GetModuleFileNameEx GetModuleFileNameExW
#endif
namespace windows_nat
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 11f54302b11..6c6dea84bfa 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -79,11 +79,9 @@ static windows_process_info windows_process;
#undef STARTUPINFO
#undef CreateProcess
-#undef GetModuleFileNameEx
#ifndef __CYGWIN__
# define __PMAX (MAX_PATH + 1)
-# define GetModuleFileNameEx GetModuleFileNameExA
# define STARTUPINFO STARTUPINFOA
# define CreateProcess CreateProcessA
#else
@@ -93,7 +91,6 @@ static windows_process_info windows_process;
static CORE_ADDR cygwin_load_end;
# define __USEWIDE
typedef wchar_t cygwin_buf_t;
-# define GetModuleFileNameEx GetModuleFileNameExW
# define STARTUPINFO STARTUPINFOW
# define CreateProcess CreateProcessW
#endif
--
2.36.1
next prev parent reply other threads:[~2022-05-21 11:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-21 11:10 [PATCH 0/4] Various Cygwin build fixes Jon Turney
2022-05-21 11:10 ` Jon Turney [this message]
2022-05-21 11:10 ` [PATCH 2/4] Fix Cygwin build after 0578e87f Jon Turney
2022-05-21 11:10 ` [PATCH 3/4] Fix Cygwin build after 85b25bd9 Jon Turney
2022-05-21 11:10 ` [PATCH 4/4] Fix a new warning on Cygwin Jon Turney
2022-05-26 16:55 ` [PATCH 0/4] Various Cygwin build fixes Tom Tromey
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=20220521111057.13089-2-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).