mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-10-05 22:29:49 +00:00
Fix name clash between typedef and struct definition.
Interesting, all three compilers in Erik Ekman's travis-ci don't complain. But my gcc at home does...
This commit is contained in:
parent
f4f204b850
commit
bbedb35bf3
@ -1406,7 +1406,7 @@ netif_find(const char *name)
|
|||||||
* Add extended netif events listener
|
* Add extended netif events listener
|
||||||
* @param callback pointer to listener structure
|
* @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) {
|
if (callback->callback_fn != NULL) {
|
||||||
return; /* already registered */
|
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 num depends on reason, see reason description
|
||||||
* @param arg 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;
|
netif_ext_callback_t* callback = ext_callback;
|
||||||
|
|
||||||
|
@ -538,18 +538,18 @@ typedef enum
|
|||||||
* @param num depends on reason, see reason description
|
* @param num depends on reason, see reason description
|
||||||
* @param arg 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
|
#if LWIP_NETIF_EXT_STATUS_CALLBACK
|
||||||
struct netif_ext_callback;
|
struct netif_ext_callback;
|
||||||
typedef 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;
|
struct netif_ext_callback* next;
|
||||||
} netif_ext_callback_t;
|
} netif_ext_callback_t;
|
||||||
|
|
||||||
#define NETIF_DECLARE_EXT_CALLBACK(name) static netif_ext_callback_t name;
|
#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);
|
void netif_invoke_ext_callback(struct netif* netif, netif_nsc_reason_t reason, u16_t num, const void* arg);
|
||||||
#else
|
#else
|
||||||
#define NETIF_DECLARE_EXT_CALLBACK(name)
|
#define NETIF_DECLARE_EXT_CALLBACK(name)
|
||||||
|
Loading…
Reference in New Issue
Block a user