abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-09-24 01:33:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cyclic dependencies by careful re-ordering of #includes.

Browse Source 
This is really nasty. Can we forward-declare pointers to structs?
This commit is contained in:
likewise
2004-03-12 00:10:07 +00:00
parent 239c6fe070
commit 82f852abf3
10 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/dhcp.c
View File

@@ -72,9 +72,9 @@
#include "lwip/stats.h"
#include "lwip/mem.h"
#include "lwip/udp.h"
#include "lwip/ip_addr.h"
#include "lwip/netif.h"
#include "lwip/inet.h"
#include "lwip/ip_addr.h"
#include "netif/etharp.h"
#include "lwip/sys.h"

12
src/core/ipv4/ip_addr.c
View File

@@ -41,14 +41,14 @@ const struct ip_addr ip_addr_broadcast = { 0xffffffffUL };
* as it does not support non-broadcast interfaces.
* lwip-devel 18-2-2004
*/
#if 0 /* going to replace macro in ip_addr.h */
#if 1 /* going to replace macro in ip_addr.h */
#include "lwip/netif.h"
u8_t ip_addr_isbroadcast(struct ip_addr *addr, netif)
u8_t ip_addr_isbroadcast(struct ip_addr *addr, struct netif *netif)
{
/* all ones (broadcast) or all zeroes (old skool broadcast) */
if (addr->addr == ip_addr_broadcast.ip_addr) ||
addr->addr == ip_addr_any.ip_addr))
if ((addr->addr == ip_addr_broadcast.addr) ||
(addr->addr == ip_addr_any.addr))
return 1;
/* no broadcast support on this network interface
* we cannot proceed matching against broadcast addresses */
@@ -58,8 +58,8 @@ u8_t ip_addr_isbroadcast(struct ip_addr *addr, netif)
else if (addr->addr == netif->ip_addr.addr)
return 0;
/* host identifier bits are all ones? => network broadcast address */
else if (addr->addr & ~netif->netmask.addr ==
ip_addr_broadcast.ip_addr & ~netif->netmask.addr)
else if ((addr->addr & ~netif->netmask.addr) ==
(ip_addr_broadcast.addr & ~netif->netmask.addr))
return 1;
else
return 0;

3
src/core/netif.c
View File

@@ -39,11 +39,10 @@
#include "lwip/opt.h"
#include "lwip/def.h"
#include "lwip/netif.h"
#include "lwip/ip_addr.h"
#include "lwip/netif.h"
#include "lwip/tcp.h"
struct netif *netif_list = NULL;
struct netif *netif_default = NULL;

2
src/core/raw.c
View File

@@ -47,8 +47,8 @@
#include "lwip/def.h"
#include "lwip/memp.h"
#include "lwip/inet.h"
#include "lwip/netif.h"
#include "lwip/ip_addr.h"
#include "lwip/netif.h"
#include "lwip/raw.h"
#include "lwip/stats.h"

1
src/core/tcp_in.c
View File

@@ -51,6 +51,7 @@
#include "lwip/def.h"
#include "lwip/opt.h"
#include "lwip/ip_addr.h"
#include "lwip/netif.h"
#include "lwip/mem.h"
#include "lwip/memp.h"

3
src/core/tcp_out.c
View File

@@ -51,6 +51,7 @@
#include "lwip/memp.h"
#include "lwip/sys.h"
#include "lwip/ip_addr.h"
#include "lwip/netif.h"
#include "lwip/inet.h"
@@ -63,8 +64,6 @@
/* Forward declarations.*/
static void tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb);
err_t
tcp_send_ctrl(struct tcp_pcb *pcb, u8_t flags)
{

2
src/core/udp.c
View File

@@ -47,10 +47,10 @@
#include "lwip/def.h"
#include "lwip/memp.h"
#include "lwip/inet.h"
#include "lwip/ip_addr.h"
#include "lwip/netif.h"
#include "lwip/udp.h"
#include "lwip/icmp.h"
#include "lwip/ip_addr.h"
#include "lwip/stats.h"