native/net/tapdev: Fix for new UIP_CONF_IPV6
handling.
This commit is contained in:
parent
382308e6bf
commit
9c70e0e5cc
|
@ -31,6 +31,8 @@
|
|||
*/
|
||||
|
||||
#include "contiki-net.h"
|
||||
#include "net/uip.h"
|
||||
#include "net/uipopt.h"
|
||||
|
||||
#if UIP_CONF_IPV6
|
||||
#include "tapdev6.h"
|
||||
|
|
|
@ -33,6 +33,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "net/uip.h"
|
||||
#include "net/uipopt.h"
|
||||
|
||||
#if !UIP_CONF_IPV6
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
@ -198,3 +203,5 @@ tapdev_exit(void)
|
|||
{
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
#endif /* !UIP_CONF_IPV6 */
|
||||
|
|
|
@ -33,6 +33,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "net/uip.h"
|
||||
#include "net/uipopt.h"
|
||||
|
||||
#if UIP_CONF_IPV6
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -413,3 +417,5 @@ tapdev_exit(void)
|
|||
close(fd);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
||||
#endif /* UIP_CONF_IPV6 */
|
||||
|
|
|
@ -14,13 +14,7 @@ CONTIKI_TARGET_SOURCEFILES = contiki-main.c clock.c leds.c leds-arch.c cfs-posix
|
|||
ifeq ($(HOST_OS),Windows)
|
||||
CONTIKI_TARGET_SOURCEFILES += wpcap-drv.c wpcap.c
|
||||
else
|
||||
CONTIKI_TARGET_SOURCEFILES += tapdev-drv.c
|
||||
#math
|
||||
ifneq ($(UIP_CONF_IPV6),1)
|
||||
CONTIKI_TARGET_SOURCEFILES += tapdev.c
|
||||
else
|
||||
CONTIKI_TARGET_SOURCEFILES += tapdev6.c
|
||||
endif
|
||||
CONTIKI_TARGET_SOURCEFILES += tapdev-drv.c tapdev.c tapdev6.c
|
||||
endif
|
||||
|
||||
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
|
||||
|
|
Loading…
Reference in a new issue