forked from Imagelibrary/binutils-gdb
Avoid conflict with gnulib open/close macros.
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:
@@ -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]);
|
||||
|
||||
Reference in New Issue
Block a user