diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-05-02 06:28:59 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-05-02 06:28:59 -0600 |
| commit | 41b50c286aaa99b848c4b21685f81ee2511f176a (patch) | |
| tree | 8f857d30919cdec50e00ebb7a141717617474303 /nuttx/include | |
| parent | 86e3c09296ce9453f1feb380c976dce52aead0e6 (diff) | |
| download | px4-nuttx-41b50c286aaa99b848c4b21685f81ee2511f176a.tar.gz px4-nuttx-41b50c286aaa99b848c4b21685f81ee2511f176a.tar.bz2 px4-nuttx-41b50c286aaa99b848c4b21685f81ee2511f176a.zip | |
Changes to remove some warning sduring compilation for ZKit-arm-1769 Board.
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/assert.h | 15 | ||||
| -rw-r--r-- | nuttx/include/nuttx/net/net.h | 5 |
2 files changed, 10 insertions, 10 deletions
diff --git a/nuttx/include/assert.h b/nuttx/include/assert.h index 29eb7a4b3..2159ea868 100644 --- a/nuttx/include/assert.h +++ b/nuttx/include/assert.h @@ -47,14 +47,13 @@ * Pre-processor Definitions ****************************************************************************/ -/* Macro Name: ASSERT, ASSERTCODE, et al. */ - -#undef ASSERT - Assert if the condition is not true -#undef ASSERTCODE - Assert with an error code if the condition is not true -#undef VERIFY - Assert if a function returns a negative value -#undef DEBUGASSERT - Like ASSERT, but only if CONFIG_DEBUG is defined -#undef DEBUGVERIFY - Like VERIFY, but only if CONFIG_DEBUG is defined -#undef PANIC - Unconditional error with code +/* Macro Name: ASSERT, VERIFY, et al. */ + +#undef ASSERT /* Assert if the condition is not true */ +#undef VERIFY /* Assert if a function returns a negative value */ +#undef DEBUGASSERT /* Like ASSERT, but only if CONFIG_DEBUG is defined */ +#undef DEBUGVERIFY /* Like VERIFY, but only if CONFIG_DEBUG is defined */ +#undef PANIC /* Unconditional abort */ #ifdef CONFIG_HAVE_FILENAME diff --git a/nuttx/include/nuttx/net/net.h b/nuttx/include/nuttx/net/net.h index a7f8f0578..d9ba5b9f4 100644 --- a/nuttx/include/nuttx/net/net.h +++ b/nuttx/include/nuttx/net/net.h @@ -112,7 +112,7 @@ struct socketlist /* Callback from netdev_foreach() */ -struct uip_driver_s; /* Forward reference. See nuttx/net/uip/uip-arch.h */ +struct uip_driver_s; /* Forward reference. Defined in nuttx/net/uip/uip-arch.h */ typedef int (*netdev_callback_t)(FAR struct uip_driver_s *dev, void *arg); /**************************************************************************** @@ -172,6 +172,7 @@ int psock_close(FAR struct socket *psock); /* net_close.c ***************************************************************/ /* Performs the bind() operation on a socket instance */ +struct sockaddr; /* Forward reference. Defined in nuttx/include/sys/socket.h */ int psock_bind(FAR struct socket *psock, FAR const struct sockaddr *addr, socklen_t addrlen); @@ -198,7 +199,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf, /* recvfrom using the underlying socket structure */ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, - int flags,FAR struct sockaddr *from, + int flags, FAR struct sockaddr *from, FAR socklen_t *fromlen); /* recv using the underlying socket structure */ |