From c9c157c7650a7570123869445e7dd331ecdd3317 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri, 20 May 2022 14:35:57 +0100
Subject: [PATCH] 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__.
---
 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.30.2