mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-03 21:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP,SLIP include lwip/sio.h after lwip/sys.h to prevent functions prototype collision

Browse Source 
User port may redefine sio_* functions, we must ensure we are loading
user functions prototypes before loading default prototypes.
This commit is contained in:
Sylvain Rochet 2014-12-24 21:23:54 +01:00
parent b30faa577d
commit 7d077a2260
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/netif/ppp/ppp.h
View File

@ -38,11 +38,11 @@
#define PPP_H
#include "lwip/def.h"
#include "lwip/sio.h"
#include "lwip/stats.h"
#include "lwip/mem.h"
#include "lwip/netif.h"
#include "lwip/sys.h"
#include "lwip/sio.h"
#include "lwip/timers.h"
#if PPP_IPV6_SUPPORT
#include "lwip/ip6_addr.h"

1
src/include/netif/ppp/ppp_impl.h
View File

@ -45,7 +45,6 @@
#include "lwip/netif.h"
#include "lwip/def.h"
#include "lwip/timers.h"
#include "lwip/sio.h"
#include "ppp.h"
#include "pppdebug.h"

2
src/netif/slipif.c
View File

@ -64,8 +64,8 @@
#include "lwip/pbuf.h"
#include "lwip/stats.h"
#include "lwip/snmp.h"
#include "lwip/sio.h"
#include "lwip/sys.h"
#include "lwip/sio.h"
#define SLIP_END 0xC0 /* 0300: start and end of every packet */
#define SLIP_ESC 0xDB /* 0333: escape start (one byte escaped data follows) */