diff --git a/cpu/native/net/linuxradio-drv.c b/cpu/native/net/linuxradio-drv.c index 9f78e9cf1..f07861f86 100644 --- a/cpu/native/net/linuxradio-drv.c +++ b/cpu/native/net/linuxradio-drv.c @@ -34,8 +34,9 @@ */ #include "contiki.h" +#include "contiki-conf.h" -#ifdef linux +#if defined(linux) && UIP_CONF_IPV6 #include "linuxradio-drv.h" diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index 6b6b58e4a..bbc44642b 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -35,6 +35,9 @@ #include #include +#ifndef WIN32_LEAN_AND_MEAN +#include +#endif struct select_callback { int (* set_fd)(fd_set *fdr, fd_set *fdw); @@ -157,6 +160,8 @@ typedef unsigned short uip_stats_t; /* Not used but avoids compile errors while sicslowpan.c is being developed */ #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 +#define NETSTACK_CONF_LINUXRADIO_DEV "wpan0" + #define UIP_CONF_UDP 1 #define UIP_CONF_TCP 1 @@ -174,8 +179,6 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_DS6_AADDR_NBU 0 #endif /* NETSTACK_CONF_WITH_IPV6 */ -#define NETSTACK_CONF_LINUXRADIO_DEV "wpan0" - typedef unsigned long clock_time_t; #define CLOCK_CONF_SECOND 1000 #define INFINITE_TIME ULONG_MAX