diff --git a/net/local/local.h b/net/local/local.h index 05b4360a85..244e33296d 100644 --- a/net/local/local.h +++ b/net/local/local.h @@ -45,7 +45,6 @@ * Pre-processor Definitions ****************************************************************************/ -#define HAVE_LOCAL_POLL 1 #define LOCAL_NPOLLWAITERS 2 /* Packet format in FIFO: @@ -151,14 +150,12 @@ struct local_conn_s sem_t lc_waitsem; /* Use to wait for a connection to be accepted */ -#ifdef HAVE_LOCAL_POLL /* The following is a list if poll structures of threads waiting for * socket events. */ struct pollfd *lc_accept_fds[LOCAL_NPOLLWAITERS]; struct pollfd lc_inout_fds[2*LOCAL_NPOLLWAITERS]; -#endif /* Union of fields unique to SOCK_STREAM client, server, and connected * peers. @@ -628,12 +625,8 @@ int local_open_sender(FAR struct local_conn_s *conn, FAR const char *path, * Name: local_accept_pollnotify ****************************************************************************/ -#ifdef HAVE_LOCAL_POLL void local_accept_pollnotify(FAR struct local_conn_s *conn, pollevent_t eventset); -#else -#define local_accept_pollnotify(conn, eventset) ((void)(conn)) -#endif /**************************************************************************** * Name: local_pollsetup @@ -651,9 +644,7 @@ void local_accept_pollnotify(FAR struct local_conn_s *conn, * ****************************************************************************/ -#ifdef HAVE_LOCAL_POLL int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds); -#endif /**************************************************************************** * Name: local_pollteardown @@ -671,9 +662,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds); * ****************************************************************************/ -#ifdef HAVE_LOCAL_POLL int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds); -#endif #undef EXTERN #ifdef __cplusplus diff --git a/net/local/local_netpoll.c b/net/local/local_netpoll.c index 531f3fffb8..299433429f 100644 --- a/net/local/local_netpoll.c +++ b/net/local/local_netpoll.c @@ -36,8 +36,6 @@ #include "socket/socket.h" #include "local/local.h" -#ifdef HAVE_LOCAL_POLL - /**************************************************************************** * Name: local_accept_pollsetup ****************************************************************************/ @@ -390,5 +388,3 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds) return ret; } - -#endif /* HAVE_LOCAL_POLL */ diff --git a/net/local/local_sockif.c b/net/local/local_sockif.c index 24350e1162..41ce698e88 100644 --- a/net/local/local_sockif.c +++ b/net/local/local_sockif.c @@ -609,9 +609,6 @@ static int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr, static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds, bool setup) { -#ifndef HAVE_LOCAL_POLL - return -ENOSYS; -#else /* Check if we are setting up or tearing down the poll */ if (setup) @@ -626,7 +623,6 @@ static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds, return local_pollteardown(psock, fds); } -#endif /* HAVE_LOCAL_POLL */ } /****************************************************************************