ipc: De-duplicate member for simplicity and to avoid Doxygen warning

This commit is contained in:
Ryan Pavlik 2021-03-25 12:05:15 -05:00
parent 12f9cac46b
commit 20468070fa

View file

@ -160,13 +160,17 @@ struct ipc_device
*/ */
struct ipc_server_mainloop struct ipc_server_mainloop
{ {
#if defined(XRT_OS_ANDROID) || defined(XRT_OS_LINUX) || defined(XRT_DOXYGEN)
//! For waiting on various events in the main thread.
int epoll_fd;
#endif
#if defined(XRT_OS_ANDROID) || defined(XRT_DOXYGEN) #if defined(XRT_OS_ANDROID) || defined(XRT_DOXYGEN)
/*! /*!
* @name Android Mainloop Members * @name Android Mainloop Members
* @{ * @{
*/ */
//! For waiting on various events in the main thread.
int epoll_fd;
//! File descriptor for the read end of our pipe for submitting new clients //! File descriptor for the read end of our pipe for submitting new clients
int pipe_read; int pipe_read;
@ -233,9 +237,6 @@ struct ipc_server_mainloop
//! Socket that we accept connections on. //! Socket that we accept connections on.
int listen_socket; int listen_socket;
//! For waiting on various events in the main thread.
int epoll_fd;
//! Were we launched by socket activation, instead of explicitly? //! Were we launched by socket activation, instead of explicitly?
bool launched_by_socket; bool launched_by_socket;