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

4 files changed, 11 insertions, 11 deletions

diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/net/uip/uip.h
index 640ac07fc..0482b9099 100644
--- a/nuttx/include/net/uip/uip.h
+++ b/nuttx/include/net/uip/uip.h
@@ -5,7 +5,7 @@
  * are used by uIP programs as well as internal uIP structures and function
  * declarations.
  *
- *   Copyright (C) 2007, 2008, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -203,7 +203,7 @@ struct uip_ip_hdr
  *   flink   - Supports a singly linked list
  *   event   - Provides the address of the callback function entry point.
  *             pvconn is a pointer to one of struct uip_conn or struct uip_udp_conn.
- *   private - Holds a reference to application specific data that will
+ *   priv    - Holds a reference to application specific data that will
  *             provided
  *   flags   - Set by the application to inform the uIP layer which flags
  *             are and are not handled by the callback.
@@ -213,8 +213,8 @@ struct uip_driver_s;       /* Forward reference */
 struct uip_callback_s
 {
   FAR struct uip_callback_s *flink;
-  uint16 (*event)(struct uip_driver_s *dev, void *pvconn, void *pvprivate, uint16 flags);
-  void *private;
+  uint16 (*event)(struct uip_driver_s *dev, void *pvconn, void *pvpriv, uint16 flags);
+  void *priv;
   uint16 flags;
 };
 
diff --git a/nuttx/include/nuttx/fs.h b/nuttx/include/nuttx/fs.h
index 68733029f..b33bfa234 100644
--- a/nuttx/include/nuttx/fs.h
+++ b/nuttx/include/nuttx/fs.h
@@ -351,7 +351,7 @@ EXTERN int files_dup(FAR struct file *filep1, FAR struct file *filep2);
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
 EXTERN int file_dup(int fd);
 #else
-#  defile file_dup(fd)        dup(fd)
+#  define file_dup(fd)        dup(fd)
 #endif
 
 /* fs_filedup2.c *************************************************************/
@@ -363,7 +363,7 @@ EXTERN int file_dup(int fd);
 #if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
 EXTERN int file_dup2(int fd1, int fd2);
 #else
-#  defile file_dup2(fd1, fd2) dup2(fd1, fd2)
+#  define file_dup2(fd1, fd2) dup2(fd1, fd2)
 #endif
 
 /* fs_openblockdriver.c ******************************************************/
diff --git a/nuttx/include/nuttx/usbdev.h b/nuttx/include/nuttx/usbdev.h
index 57a9f36fe..0deea404e 100644
--- a/nuttx/include/nuttx/usbdev.h
+++ b/nuttx/include/nuttx/usbdev.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * include/nuttx/usbdev.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * NOTE:  This interface was inspired by the Linux gadget interface by
@@ -199,7 +199,7 @@ struct usbdev_req_s
   /* Callback when the transfer completes */
 
   void  (*callback)(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req);
-  void   *private; /* Used only by callee */
+  void   *priv;    /* Used only by callee */
 };
 
 /* Endpoint-specific interface to USB controller hardware. */
@@ -240,7 +240,7 @@ struct usbdev_ep_s
   const struct usbdev_epops_s *ops; /* Endpoint operations */
   ubyte  eplog;                     /* Logical endpoint address */
   uint16 maxpacket;                 /* Maximum packet size for this endpoint */
-  void  *private;                   /* For use by class driver */
+  void  *priv;                      /* For use by class driver */
 };
 
 /* struct usbdev_s represents a usb device */
diff --git a/nuttx/include/poll.h b/nuttx/include/poll.h
index 3b41ec99a..72c370c88 100644
--- a/nuttx/include/poll.h
+++ b/nuttx/include/poll.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/poll.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,7 +108,7 @@ struct pollfd
   sem_t      *sem;      /* Pointer to semaphore used to post output event */
   pollevent_t events;   /* The input event flags */
   pollevent_t revents;  /* The output event flags */
-  FAR void   *private;  /* For use by drivers */
+  FAR void   *priv;     /* For use by drivers */
 };
 
 /****************************************************************************