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/send.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/send.c')
| -rw-r--r-- | nuttx/net/send.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/net/send.c b/nuttx/net/send.c index 5ec9e47ee..f3d04c1a5 100644 --- a/nuttx/net/send.c +++ b/nuttx/net/send.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/send.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -196,10 +196,10 @@ static inline int send_timeout(struct send_s *pstate) ****************************************************************************/ static uint16 send_interrupt(struct uip_driver_s *dev, void *pvconn, - void *pvprivate, uint16 flags) + void *pvpriv, uint16 flags) { struct uip_conn *conn = (struct uip_conn*)pvconn; - struct send_s *pstate = (struct send_s *)pvprivate; + struct send_s *pstate = (struct send_s *)pvpriv; nvdbg("flags: %04x acked: %d sent: %d\n", flags, pstate->snd_acked, pstate->snd_sent); @@ -328,7 +328,7 @@ end_wait: /* Do not allow any further callbacks */ pstate->snd_cb->flags = 0; - pstate->snd_cb->private = NULL; + pstate->snd_cb->priv = NULL; pstate->snd_cb->event = NULL; /* Wake up the waiting thread */ @@ -468,7 +468,7 @@ ssize_t send(int sockfd, const void *buf, size_t len, int flags) /* Set up the callback in the connection */ state.snd_cb->flags = UIP_ACKDATA|UIP_REXMIT|UIP_POLL|UIP_CLOSE|UIP_ABORT|UIP_TIMEDOUT; - state.snd_cb->private = (void*)&state; + state.snd_cb->priv = (void*)&state; state.snd_cb->event = send_interrupt; /* Notify the device driver of the availaibilty of TX data */ |