mirror of
https://git.savannah.nongnu.org/git/lwip.git
synced 2026-08-09 17:13:49 +08:00
Fix bug #48436: Naming clash for timers.c (with FreeRTOS)
Rename timers.* to timeouts.*
This commit is contained in:
@@ -43,7 +43,7 @@
|
||||
|
||||
#include "lwip/tcpip.h"
|
||||
#include "lwip/sys.h"
|
||||
#include "lwip/timers.h"
|
||||
#include "lwip/timeouts.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#if !NO_SYS /* don't build if not configured for use in lwipopts.h */
|
||||
|
||||
#include "lwip/err.h"
|
||||
#include "lwip/timers.h"
|
||||
#include "lwip/timeouts.h"
|
||||
#include "lwip/netif.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
* Simon Goldschmidt
|
||||
*
|
||||
*/
|
||||
#ifndef LWIP_HDR_TIMERS_H
|
||||
#define LWIP_HDR_TIMERS_H
|
||||
#ifndef LWIP_HDR_TIMEOUTS_H
|
||||
#define LWIP_HDR_TIMEOUTS_H
|
||||
|
||||
#include "lwip/opt.h"
|
||||
|
||||
@@ -127,4 +127,4 @@ void sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* LWIP_HDR_TIMERS_H */
|
||||
#endif /* LWIP_HDR_TIMEOUTS_H */
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "lwip/mem.h"
|
||||
#include "lwip/netif.h"
|
||||
#include "lwip/sys.h"
|
||||
#include "lwip/timers.h"
|
||||
#include "lwip/timeouts.h"
|
||||
#if PPP_IPV6_SUPPORT
|
||||
#include "lwip/ip6_addr.h"
|
||||
#endif /* PPP_IPV6_SUPPORT */
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
#include "lwip/netif.h"
|
||||
#include "lwip/def.h"
|
||||
#include "lwip/timers.h"
|
||||
#include "lwip/timeouts.h"
|
||||
|
||||
#include "ppp.h"
|
||||
#include "pppdebug.h"
|
||||
|
||||
Reference in New Issue
Block a user