Skip to content

Commit

Permalink
simplelink: slnetsock: fix sys/time.h include when sockets are enabled
Browse files Browse the repository at this point in the history
This include is causing a nemspace collision between the picolibc and
the Zephyr select definitions. Looks like this was originally a '#ifndef
CONFIG_NET_SOCKETS_POSIX_NAMES' but got inverted as a positive condition
at some stage, which is now causing a build fail.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
  • Loading branch information
fabiobaltieri authored and vaishnavachath committed Sep 14, 2023
1 parent 9fa5827 commit b85f86e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions simplelink/source/ti/net/slnetsock.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ interface. Some are mandatory, others are optional (but recommended).
* Can remove this if support for CONFIG_NET_SOCKETS_POSIX_NAMES
* is dropped someday
*/
#if defined(CONFIG_NET_SOCKETS_POSIX_NAMES) || defined(CONFIG_POSIX_CLOCK) \
|| defined(CONFIG_POSIX_API)
#if !(defined(CONFIG_NET_SOCKETS_POSIX_NAMES) || defined(CONFIG_POSIX_CLOCK) \
|| defined(CONFIG_POSIX_API))
#include <sys/time.h>
#endif

Expand Down

0 comments on commit b85f86e

Please sign in to comment.