FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid conflict with gnulib open/close macros.

Browse source 
On some systems, the gnulib configuration will decide to define open
and/or close as macros to replace the POSIX C functions.  This
interferes with using those names in C++ class or namespace scopes.

gdbsupport/
	* event-pipe.cc (event_pipe::open): Renamed to ...
	(event_pipe::open_pipe): ... this.
	(event_pipe::close): Renamed to ...
	(event_pipe::close_pipe): ... this.
	* event-pipe.h (class event_pipe): Updated.
gdb/
	* inf-ptrace.h (async_file_open, async_file_close): Updated.
gdbserver/
	* gdbserver/linux-low.cc (linux_process_target::async): Likewise.
This commit is contained in:
Roland McGrath 2022-03-01 16:03:58 -08:00
parent db120fb808
commit 8674f082e3
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gdb/inf-ptrace.h
View file

@ -77,9 +77,9 @@ struct inf_ptrace_target : public inf_child_target
protected:
/* Helper routines for interacting with the async event pipe. */
bool async_file_open ()
{ return m_event_pipe.open (); }
{ return m_event_pipe.open_pipe (); }
void async_file_close ()
{ m_event_pipe.close (); }
{ m_event_pipe.close_pipe (); }
void async_file_flush ()
{ m_event_pipe.flush (); }
void async_file_mark ()

4
gdbserver/linux-low.cc
View file

@ -5810,7 +5810,7 @@ linux_process_target::async (bool enable)
if (enable)
{
if (!linux_event_pipe.open ())
if (!linux_event_pipe.open_pipe ())
{
gdb_sigmask (SIG_UNBLOCK, &mask, NULL);
@ -5830,7 +5830,7 @@ linux_process_target::async (bool enable)
{
delete_file_handler (linux_event_pipe.event_fd ());
linux_event_pipe.close ();
linux_event_pipe.close_pipe ();
}
gdb_sigmask (SIG_UNBLOCK, &mask, NULL);

6
gdbsupport/event-pipe.cc
View file

@ -28,7 +28,7 @@
event_pipe::~event_pipe ()
{
if (is_open ())
close ();
close_pipe ();
}
/* See event-pipe.h. */
@ -45,7 +45,7 @@ event_pipe::open ()
if (fcntl (m_fds[0], F_SETFL, O_NONBLOCK) == -1
|| fcntl (m_fds[1], F_SETFL, O_NONBLOCK) == -1)
{
close ();
close_pipe ();
return false;
}
@ -55,7 +55,7 @@ event_pipe::open ()
/* See event-pipe.h. */
void
event_pipe::close ()
event_pipe::close_pipe ()
{
::close (m_fds[0]);
::close (m_fds[1]);

4
gdbsupport/event-pipe.h
View file

@ -34,10 +34,10 @@ public:
DISABLE_COPY_AND_ASSIGN (event_pipe);
/* Create a new pipe. */
bool open ();
bool open_pipe ();
/* Close the pipe. */
void close ();
void close_pipe ();
/* True if the event pipe has been opened. */
bool is_open () const