Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 03:45:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

net_pkt: fix typo and symbol collision

Browse Source
This commit is contained in:
Simon Piriou
2017-07-22 09:00:36 -06:00
committed by Gregory Nutt
parent 2e7961cc55
commit d88dc9b2e5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/local/local_sockif.c
+1 -1
View File
@@ -614,7 +614,7 @@ static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds,
{ {
/* Perform the TCP/IP poll() teardown */ /* Perform the TCP/IP poll() teardown */
return loal_pollteardown(psock, fds); return local_pollteardown(psock, fds);
} }
#endif /* HAVE_LOCAL_POLL */ #endif /* HAVE_LOCAL_POLL */
} }
net/pkt/pkt_sockif.c
+4 -4
View File
@@ -72,7 +72,7 @@ static int pkt_connect(FAR struct socket *psock,
static int pkt_accept(FAR struct socket *psock, FAR struct sockaddr *addr, static int pkt_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
FAR socklen_t *addrlen, FAR struct socket *newsock); FAR socklen_t *addrlen, FAR struct socket *newsock);
#ifndef CONFIG_DISABLE_POLL #ifndef CONFIG_DISABLE_POLL
static int pkt_poll(FAR struct socket *psock, static int pkt_poll_local(FAR struct socket *psock,
FAR struct pollfd *fds, bool setup); FAR struct pollfd *fds, bool setup);
#endif #endif
static ssize_t pkt_send(FAR struct socket *psock, FAR const void *buf, static ssize_t pkt_send(FAR struct socket *psock, FAR const void *buf,
@@ -97,7 +97,7 @@ const struct sock_intf_s g_pkt_sockif =
pkt_connect, /* si_connect */ pkt_connect, /* si_connect */
pkt_accept, /* si_accept */ pkt_accept, /* si_accept */
#ifndef CONFIG_DISABLE_POLL #ifndef CONFIG_DISABLE_POLL
pkt_poll, /* si_poll */ pkt_poll_local, /* si_poll */
#endif #endif
pkt_send, /* si_send */ pkt_send, /* si_send */
pkt_sendto, /* si_sendto */ pkt_sendto, /* si_sendto */
@@ -475,8 +475,8 @@ int pkt_listen(FAR struct socket *psock, int backlog)
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_DISABLE_POLL #ifndef CONFIG_DISABLE_POLL
static int pkt_poll(FAR struct socket *psock, FAR struct pollfd *fds, static int pkt_poll_local(FAR struct socket *psock, FAR struct pollfd *fds,
bool setup) bool setup)
{ {
return -ENOSYS; return -ENOSYS;
} }