Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Reserved word 'private' in C header files is a problem for C++

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1890 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-06-16 23:23:31 +00:00
parent c344589c85
commit 6ad27ed177
22 changed files with 131 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/net_close.c
+4 -4
View File
@@ -88,9 +88,9 @@ struct tcp_close_s
#ifdef CONFIG_NET_TCP
static uint16 netclose_interrupt(struct uip_driver_s *dev, void *pvconn,
void *pvprivate, uint16 flags)
void *pvpriv, uint16 flags)
{
struct tcp_close_s *pstate = (struct tcp_close_s *)pvprivate;
struct tcp_close_s *pstate = (struct tcp_close_s *)pvpriv;
nvdbg("flags: %04x\n", flags);
@@ -105,7 +105,7 @@ static uint16 netclose_interrupt(struct uip_driver_s *dev, void *pvconn,
/* The disconnection is complete */
pstate->cl_cb->flags = 0;
pstate->cl_cb->private = NULL;
pstate->cl_cb->priv = NULL;
pstate->cl_cb->event = NULL;
sem_post(&pstate->cl_sem);
nvdbg("Resuming\n");
@@ -167,7 +167,7 @@ static inline void netclose_disconnect(FAR struct socket *psock)
sem_init(&state.cl_sem, 0, 0);
state.cl_cb->flags = UIP_NEWDATA|UIP_POLL|UIP_CLOSE|UIP_ABORT;
state.cl_cb->private = (void*)&state;
state.cl_cb->priv = (void*)&state;
state.cl_cb->event = netclose_interrupt;
/* Notify the device driver of the availaibilty of TX data */