deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1013 from g-oikonomou/contrib/remove-uip-guard

Browse source 
Remove unnecessary #if guards
This commit is contained in:
Nicolas Tsiftes 2015-03-30 16:59:23 +02:00
parent 7238a1628f ff118be070
commit 793ed65cba
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/net/ipv4/uip.c
View file

@ -75,18 +75,9 @@
#include "net/ipv4/uip_arp.h" #include "net/ipv4/uip_arp.h"
#include "net/ip/uip_arch.h" #include "net/ip/uip_arch.h"
#if !NETSTACK_CONF_WITH_IPV6 /* If NETSTACK_CONF_WITH_IPV6 is defined, we compile the
uip6.c file instead of this one. Therefore
this #ifndef removes the entire compilation
output of the uip.c file */
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv4/uip-neighbor.h" #include "net/ipv4/uip-neighbor.h"
#endif /* NETSTACK_CONF_WITH_IPV6 */
#include <string.h> #include <string.h>
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Variable definitions. */ /* Variable definitions. */
@ -1973,6 +1964,4 @@ uip_send(const void *data, int len)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* NETSTACK_CONF_WITH_IPV6 */
/** @}*/ /** @}*/