From ff118be0706d4e12a43a27f2fc25c3f34f4fbb92 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sat, 28 Mar 2015 23:48:20 +0000 Subject: [PATCH] Remove unnecessary #if guards ipv4/uip.c will not even be include in the list of sources in the first place if we are building with NETSTACK_CONF_WITH_IPV6 (CONTIKI_WITH_IPV6). Thus, there is no longer a need to wrap the entire source code in an #if guard. Closes #935 --- core/net/ipv4/uip.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/core/net/ipv4/uip.c b/core/net/ipv4/uip.c index 174b0a3fa..1c767e170 100644 --- a/core/net/ipv4/uip.c +++ b/core/net/ipv4/uip.c @@ -75,18 +75,9 @@ #include "net/ipv4/uip_arp.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" -#endif /* NETSTACK_CONF_WITH_IPV6 */ #include - /*---------------------------------------------------------------------------*/ /* Variable definitions. */ @@ -1973,6 +1964,4 @@ uip_send(const void *data, int len) } } /*---------------------------------------------------------------------------*/ -#endif /* NETSTACK_CONF_WITH_IPV6 */ - /** @}*/