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/connect.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/connect.c')
| -rw-r--r-- | nuttx/net/connect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/connect.c b/nuttx/net/connect.c index 9f9818d33..b530fd4d8 100644 --- a/nuttx/net/connect.c +++ b/nuttx/net/connect.c @@ -76,7 +76,7 @@ static inline int tcp_setup_callbacks(FAR struct socket *psock, FAR struct tcp_connect_s *pstate); static inline void tcp_teardown_callbacks(struct tcp_connect_s *pstate, int status); static uint16 tcp_connect_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvprivate, uint16 flags); + void *pvpriv, uint16 flags); #ifdef CONFIG_NET_IPv6 static inline int tcp_connect(FAR struct socket *psock, const struct sockaddr_in6 *inaddr); #else @@ -161,7 +161,7 @@ static inline int tcp_setup_callbacks(FAR struct socket *psock, if (pstate->tc_cb) { pstate->tc_cb->flags = UIP_NEWDATA|UIP_CLOSE|UIP_ABORT|UIP_TIMEDOUT|UIP_CONNECTED; - pstate->tc_cb->private = (void*)pstate; + pstate->tc_cb->priv = (void*)pstate; pstate->tc_cb->event = tcp_connect_interrupt; /* Set up to receive callbacks on connection-related events */ @@ -223,13 +223,13 @@ static inline void tcp_teardown_callbacks(struct tcp_connect_s *pstate, int stat #ifdef CONFIG_NET_TCP static uint16 tcp_connect_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvprivate, uint16 flags) + void *pvpriv, uint16 flags) { - struct tcp_connect_s *pstate = (struct tcp_connect_s *)pvprivate; + struct tcp_connect_s *pstate = (struct tcp_connect_s *)pvpriv; nvdbg("flags: %04x\n", flags); - /* 'private' might be null in some race conditions (?) */ + /* 'priv' might be null in some race conditions (?) */ if (pstate) { |