mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-07-07 13:29:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix name clash between typedef and struct definition.

Browse Source 
Interesting, all three compilers in Erik Ekman's travis-ci don't complain. But my gcc at home does...
This commit is contained in:
Dirk Ziegelmeier 2017-02-14 20:17:27 +01:00
parent f4f204b850
commit bbedb35bf3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/netif.c
View File

@ -1406,7 +1406,7 @@ netif_find(const char *name)
* Add extended netif events listener
* @param callback pointer to listener structure
*/
void netif_add_ext_callback(netif_ext_callback_t* callback, netif_ext_callback fn)
void netif_add_ext_callback(netif_ext_callback_t* callback, netif_ext_callback_fn fn)
{
if (callback->callback_fn != NULL) {
return; /* already registered */
@ -1425,7 +1425,7 @@ void netif_add_ext_callback(netif_ext_callback_t* callback, netif_ext_callback f
* @param num depends on reason, see reason description
* @param arg depends on reason, see reason description
*/
void netif_invoke_ext_callback(struct netif* netif, netif_nsc_reason_t reason, u16_t num, void* arg)
void netif_invoke_ext_callback(struct netif* netif, netif_nsc_reason_t reason, u16_t num, const void* arg)
{
netif_ext_callback_t* callback = ext_callback;

6
src/include/lwip/netif.h
View File

@ -538,18 +538,18 @@ typedef enum
* @param num depends on reason, see reason description
* @param arg depends on reason, see reason description
*/
typedef void (*netif_ext_callback)(struct netif* netif, netif_nsc_reason_t reason, u16_t num, const void* arg);
typedef void (*netif_ext_callback_fn)(struct netif* netif, netif_nsc_reason_t reason, u16_t num, const void* arg);
#if LWIP_NETIF_EXT_STATUS_CALLBACK
struct netif_ext_callback;
typedef struct netif_ext_callback
{
netif_ext_callback callback_fn;
netif_ext_callback_fn callback_fn;
struct netif_ext_callback* next;
} netif_ext_callback_t;
#define NETIF_DECLARE_EXT_CALLBACK(name) static netif_ext_callback_t name;
void netif_add_ext_callback(netif_ext_callback_t* callback, netif_ext_callback fn);
void netif_add_ext_callback(netif_ext_callback_t* callback, netif_ext_callback_fn fn);
void netif_invoke_ext_callback(struct netif* netif, netif_nsc_reason_t reason, u16_t num, const void* arg);
#else
#define NETIF_DECLARE_EXT_CALLBACK(name)