various IPv6-only compile fixes

This commit is contained in:
goldsimon 2018-03-07 20:55:00 +01:00
parent 972f32dd47
commit 61a1b98cc9
3 changed files with 5 additions and 5 deletions

View File

@ -427,7 +427,7 @@ httpc_get_internal_addr(httpc_state_t* req, const ip_addr_t *ipaddr)
return err; return err;
} }
#if LWIP_IPV4 && LWIP_DNS #if LWIP_DNS
/** DNS callback /** DNS callback
* If ipaddr is non-NULL, resolving succeeded and the request can be sent, otherwise it failed. * If ipaddr is non-NULL, resolving succeeded and the request can be sent, otherwise it failed.
*/ */
@ -454,7 +454,7 @@ httpc_dns_found(const char* hostname, const ip_addr_t *ipaddr, void *arg)
} }
httpc_close(req, result, 0, err); httpc_close(req, result, 0, err);
} }
#endif /* LWIP_IPV4 && LWIP_DNS */ #endif /* LWIP_DNS */
/** Start the http request after converting 'server_name' to ip address (DNS or address string) */ /** Start the http request after converting 'server_name' to ip address (DNS or address string) */
static err_t static err_t

View File

@ -223,7 +223,7 @@ typedef err_t (*netif_mld_mac_filter_fn)(struct netif *netif,
const ip6_addr_t *group, enum netif_mac_filter_action action); const ip6_addr_t *group, enum netif_mac_filter_action action);
#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */ #endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
#if LWIP_DHCP || LWIP_AUTOIP || LWIP_IGMP || LWIP_IPV6_MLD || (LWIP_NUM_NETIF_CLIENT_DATA > 0) #if LWIP_DHCP || LWIP_AUTOIP || LWIP_IGMP || LWIP_IPV6_MLD || LWIP_IPV6_DHCP6 || (LWIP_NUM_NETIF_CLIENT_DATA > 0)
#if LWIP_NUM_NETIF_CLIENT_DATA > 0 #if LWIP_NUM_NETIF_CLIENT_DATA > 0
u8_t netif_alloc_client_data_id(void); u8_t netif_alloc_client_data_id(void);
#endif #endif

View File

@ -60,7 +60,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if LWIP_SOCKET #if LWIP_SOCKET && LWIP_IPV4 /* this uses IPv4 loopback sockets, currently */
#ifndef TEST_SOCKETS_STRESS #ifndef TEST_SOCKETS_STRESS
#define TEST_SOCKETS_STRESS LWIP_DBG_OFF #define TEST_SOCKETS_STRESS LWIP_DBG_OFF
@ -610,4 +610,4 @@ sockets_stresstest_init_client(const char *remote_ip, u16_t remote_port)
sockets_stresstest_start_clients(addr); sockets_stresstest_start_clients(addr);
} }
#endif /* LWIP_SOCKET */ #endif /* LWIP_SOCKET && LWIP_IPV4 */