Merge pull request #10908 from kivaisan/fix_armc6_netconn_recv_tcp_pbuf

0xc0170 · web-flow · commit 76f085bf2f17 · 2019-07-01T09:16:36.000+01:00
Fix netconn_recv_tcp_pbuf ARMC6 linker error
diff --git a/features/lwipstack/LWIPStack.cpp b/features/lwipstack/LWIPStack.cpp
@@ -463,6 +463,7 @@ nsapi_size_or_error_t LWIP::socket_send(nsapi_socket_t handle, const void *data,
 
 nsapi_size_or_error_t LWIP::socket_recv(nsapi_socket_t handle, void *data, nsapi_size_t size)
 {
+#if LWIP_TCP
     struct mbed_lwip_socket *s = (struct mbed_lwip_socket *)handle;
 
     if (!s->buf) {
@@ -483,6 +484,9 @@ nsapi_size_or_error_t LWIP::socket_recv(nsapi_socket_t handle, void *data, nsapi
     }
 
     return recv;
+#else
+    return NSAPI_ERROR_UNSUPPORTED;
+#endif
 }
 
 nsapi_size_or_error_t LWIP::socket_sendto(nsapi_socket_t handle, const SocketAddress &address, const void *data, nsapi_size_t size)

Original file line number	Diff line number	Diff line change
`@@ -463,6 +463,7 @@ nsapi_size_or_error_t LWIP::socket_send(nsapi_socket_t handle, const void *data,`
`463`	`463`
`464`	`464`	`nsapi_size_or_error_t LWIP::socket_recv(nsapi_socket_t handle, void *data, nsapi_size_t size)`
`465`	`465`	`{`
	`466`	`+#if LWIP_TCP`
`466`	`467`	`struct mbed_lwip_socket s = (struct mbed_lwip_socket )handle;`
`467`	`468`
`468`	`469`	`if (!s->buf) {`
`@@ -483,6 +484,9 @@ nsapi_size_or_error_t LWIP::socket_recv(nsapi_socket_t handle, void *data, nsapi`
`483`	`484`	`}`
`484`	`485`
`485`	`486`	`return recv;`
	`487`	`+#else`
	`488`	`+ return NSAPI_ERROR_UNSUPPORTED;`
	`489`	`+#endif`
`486`	`490`	`}`
`487`	`491`
`488`	`492`	`nsapi_size_or_error_t LWIP::socket_sendto(nsapi_socket_t handle, const SocketAddress &address, const void *data, nsapi_size_t size)`