From 1169d36fd1d02c9c0432ee3317c4a749931c7f68 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 15 Feb 2015 15:18:35 -0600
Subject: Suffer the consequences of moving struct timeval to its correct
 location

---
 .../nuttx/wireless/cc3000/include/sys/socket.h        |  1 +
 nuttx/include/sys/select.h                            |  8 +++++---
 nuttx/include/sys/types.h                             |  5 +++--
 nuttx/include/time.h                                  | 19 +++++++++++++------
 4 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'nuttx/include')

diff --git a/nuttx/include/nuttx/wireless/cc3000/include/sys/socket.h b/nuttx/include/nuttx/wireless/cc3000/include/sys/socket.h
index 77a0f1b2e..6eb1df2ef 100644
--- a/nuttx/include/nuttx/wireless/cc3000/include/sys/socket.h
+++ b/nuttx/include/nuttx/wireless/cc3000/include/sys/socket.h
@@ -288,6 +288,7 @@ int connect(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen);
  *
  *****************************************************************************/
 
+struct timeval;
 int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds,
                   struct timeval *timeout);
 
diff --git a/nuttx/include/sys/select.h b/nuttx/include/sys/select.h
index 1ff074b6c..6ce8ff861 100644
--- a/nuttx/include/sys/select.h
+++ b/nuttx/include/sys/select.h
@@ -104,13 +104,15 @@ typedef uint32_t fd_set[__SELECT_NUINT32];
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
 
-EXTERN int select(int nfds, FAR fd_set *readfds, FAR fd_set *writefds,
-                  FAR fd_set *exceptfds, FAR struct timeval *timeout);
+struct timeval;
+int select(int nfds, FAR fd_set *readfds, FAR fd_set *writefds,
+           FAR fd_set *exceptfds, FAR struct timeval *timeout);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/nuttx/include/sys/types.h b/nuttx/include/sys/types.h
index 530434b22..102bde622 100644
--- a/nuttx/include/sys/types.h
+++ b/nuttx/include/sys/types.h
@@ -94,8 +94,9 @@
 #define PRIOR_OTHER_MIN   0
 #define PRIOR_OTHER_MAX 255
 
-/* Scheduling Priorities.  NOTE:  Only the idle task can take
- * the true minimum priority. */
+/* Scheduling Priorities.  NOTE:  Only the idle task can take the true
+ * minimum priority.
+ */
 
 #define SCHED_PRIORITY_MAX     255
 #define SCHED_PRIORITY_DEFAULT 100
diff --git a/nuttx/include/time.h b/nuttx/include/time.h
index 832927ea8..c43385ace 100644
--- a/nuttx/include/time.h
+++ b/nuttx/include/time.h
@@ -159,12 +159,6 @@ struct sigevent;
  * Public Data
  ********************************************************************************/
 
-/* extern char *tznames[]; not supported */
-
-/********************************************************************************
- * Public Function Prototypes
- ********************************************************************************/
-
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
@@ -174,6 +168,19 @@ extern "C"
 #define EXTERN extern
 #endif
 
+/* daylight - Daylight savings time flag */
+/* EXTERN int daylight; not supported */
+
+/* timezone - Difference from UTC and local standard time
+/* EXTERN long int timezone; not supported */
+
+/* tzname[] - Timezone strings */
+/* EXTERN FAR char *tzname[]; not supported */
+
+/********************************************************************************
+ * Public Function Prototypes
+ ********************************************************************************/
+
 clock_t clock(void);
 
 int clock_settime(clockid_t clockid, FAR const struct timespec *tp);
-- 
cgit v1.2.3