diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2022-05-20 14:35:57 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2022-06-02 10:39:44 +0100 |
| commit | c9c157c7650a7570123869445e7dd331ecdd3317 (patch) | |
| tree | dee0e3d0478d3bdfea78581a83bbb8a1c542d353 | |
| parent | 6a031255cf1842447a143849e720349eb00533d2 (diff) | |
| download | gdb-c9c157c7650a7570123869445e7dd331ecdd3317.zip gdb-c9c157c7650a7570123869445e7dd331ecdd3317.tar.gz gdb-c9c157c7650a7570123869445e7dd331ecdd3317.tar.bz2 | |
Fix Cygwin build after fcab5839
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__.
| -rw-r--r-- | gdb/nat/windows-nat.c | 9 | ||||
| -rw-r--r-- | 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 71a18a0..f681801 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 11f5430..6c6dea8 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 |