From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 401A1395A073; Thu, 2 Jun 2022 09:40:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 401A1395A073 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon TURNEY To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix Cygwin build after 0578e87f X-Act-Checkin: binutils-gdb X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: c9c157c7650a7570123869445e7dd331ecdd3317 X-Git-Newrev: 1f03fa9921802a727bb218da2df26e4ed14fc1c9 Message-Id: <20220602094041.401A1395A073@sourceware.org> Date: Thu, 2 Jun 2022 09:40:41 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 09:40:41 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D1f03fa992180= 2a727bb218da2df26e4ed14fc1c9 commit 1f03fa9921802a727bb218da2df26e4ed14fc1c9 Author: Jon Turney Date: Fri May 20 14:45:53 2022 +0100 Fix Cygwin build after 0578e87f =20 Fix Cygwin build after 0578e87f ("Remove some globals from nat/windows-nat.c"). Update code under ifdef __CYGWIN__ for globals moved to members of struct windows_process_info. Diff: --- gdb/nat/windows-nat.c | 2 +- gdb/windows-nat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c index f6818015c53..ca6a529601e 100644 --- a/gdb/nat/windows-nat.c +++ b/gdb/nat/windows-nat.c @@ -198,7 +198,7 @@ windows_process_info::get_exec_module_filename (char *e= xe_name_ret, to POSIX format into the destination buffer. */ cygwin_buf_t *pathbuf =3D (cygwin_buf_t *) alloca (exe_name_max_len * = sizeof (cygwin_buf_t)); =20 - len =3D GetModuleFileNameEx (current_process_handle, + len =3D GetModuleFileNameEx (handle, dh_buf, pathbuf, exe_name_max_len); if (len =3D=3D 0) error (_("Error getting executable filename: %u."), diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 6c6dea84bfa..ab0efe72d8f 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -884,7 +884,7 @@ windows_nat::windows_process_info::handle_output_debug_= string if (!retval) retval =3D current_event.dwThreadId; else if ((x =3D (LPCVOID) (uintptr_t) strtoull (p, NULL, 0)) - && ReadProcessMemory (current_process_handle, x, + && ReadProcessMemory (handle, x, &saved_context, __COPY_CONTEXT_SIZE, &n) && n =3D=3D __COPY_CONTEXT_SIZE)