Fix bug #48436: Naming clash for timers.c (with FreeRTOS)

Rename timers.* to timeouts.*
This commit is contained in:
Dirk Ziegelmeier
2016-07-19 12:44:12 +02:00
parent 6adeb706a6
commit 5d4c1432c2
11 changed files with 13 additions and 13 deletions

View File

@@ -43,7 +43,7 @@
#include "lwip/tcpip.h"
#include "lwip/sys.h"
#include "lwip/timers.h"
#include "lwip/timeouts.h"
#ifdef __cplusplus
extern "C" {

View File

@@ -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

View File

@@ -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 */

View File

@@ -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 */

View File

@@ -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"