diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-16 23:23:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-16 23:23:31 +0000 |
| commit | 1bb56fb39d8db0c9a419818f82fa7e517cad55bc (patch) | |
| tree | c6d5b6911e4ae7c85e4aa0b2f7a07c387c618d38 /nuttx/net/uip/uip_icmpping.c | |
| parent | 731994d0383c636e43644c3dc91b91b15745b345 (diff) | |
| download | px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.tar.gz px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.tar.bz2 px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.zip | |
Reserved word 'private' in C header files is a problem for C++
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1890 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net/uip/uip_icmpping.c')
| -rw-r--r-- | nuttx/net/uip/uip_icmpping.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/uip/uip_icmpping.c b/nuttx/net/uip/uip_icmpping.c index 6c2c57c91..9a68ca543 100644 --- a/nuttx/net/uip/uip_icmpping.c +++ b/nuttx/net/uip/uip_icmpping.c @@ -134,7 +134,7 @@ static inline int ping_timeout(struct icmp_ping_s *pstate) * Parameters: * dev The structure of the network driver that caused the interrupt * conn The received packet, cast to void * - * pvprivate An instance of struct icmp_ping_s cast to void* + * pvpriv An instance of struct icmp_ping_s cast to void* * flags Set of events describing why the callback was invoked * * Returned Value: @@ -146,9 +146,9 @@ static inline int ping_timeout(struct icmp_ping_s *pstate) ****************************************************************************/ static uint16 ping_interrupt(struct uip_driver_s *dev, void *conn, - void *pvprivate, uint16 flags) + void *pvpriv, uint16 flags) { - struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvprivate; + struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvpriv; ubyte *ptr; int failcode = -ETIMEDOUT; int i; @@ -269,7 +269,7 @@ end_wait: /* Do not allow any further callbacks */ pstate->png_cb->flags = 0; - pstate->png_cb->private = NULL; + pstate->png_cb->priv = NULL; pstate->png_cb->event = NULL; /* Wake up the waiting thread */ @@ -334,7 +334,7 @@ int uip_ping(uip_ipaddr_t addr, uint16 id, uint16 seqno, uint16 datalen, int dse if (state.png_cb) { state.png_cb->flags = UIP_POLL|UIP_ECHOREPLY; - state.png_cb->private = (void*)&state; + state.png_cb->priv = (void*)&state; state.png_cb->event = ping_interrupt; state.png_result = -EINTR; /* Assume sem-wait interrupted by signal */ |