Restructure header files for POSIX compliance; eliminate compile warnings

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@107 42af7a65-404d-4744-a932-0658087f49c3

9 files changed, 12 insertions, 23 deletions

diff --git a/nuttx/lib/lib_fclose.c b/nuttx/lib/lib_fclose.c
index 979e75a6f..a7960e823 100644
--- a/nuttx/lib/lib_fclose.c
+++ b/nuttx/lib/lib_fclose.c
@@ -44,6 +44,7 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/nuttx/lib/lib_fflush.c b/nuttx/lib/lib_fflush.c
index e7f4e6960..12dfd8b12 100644
--- a/nuttx/lib/lib_fflush.c
+++ b/nuttx/lib/lib_fflush.c
@@ -43,6 +43,8 @@
 
 #include <nuttx/config.h>  /* for CONFIG_STDIO_BUFFER_SIZE */
 #include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <nuttx/fs.h>
 #include "lib_internal.h"
diff --git a/nuttx/lib/lib_fgets.c b/nuttx/lib/lib_fgets.c
index 27f9ecdcd..561d4a85e 100644
--- a/nuttx/lib/lib_fgets.c
+++ b/nuttx/lib/lib_fgets.c
@@ -37,7 +37,9 @@
  * Included Files
  ************************************************************/
 
+#include <nuttx/config.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <debug.h>
diff --git a/nuttx/lib/lib_fopen.c b/nuttx/lib/lib_fopen.c
index 1d4b66ac8..ec699c340 100644
--- a/nuttx/lib/lib_fopen.c
+++ b/nuttx/lib/lib_fopen.c
@@ -45,6 +45,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include "lib_internal.h"
diff --git a/nuttx/lib/lib_init.c b/nuttx/lib/lib_init.c
index dc0643144..0e820ff4c 100644
--- a/nuttx/lib/lib_init.c
+++ b/nuttx/lib/lib_init.c
@@ -57,27 +57,6 @@
  * Private Functions
  ************************************************************/
 
-#if CONFIG_NFILE_STREAMS > 0
-static void _lib_semtake(FAR struct streamlist *list)
-{
-  /* Take the semaphore (perhaps waiting) */
-
-  while (sem_wait(&list->sl_sem) != 0)
-    {
-      /* The only case that an error should occr here is if
-       * the wait was awakened by a signal.
-       */
-
-      ASSERT(*get_errno_ptr() == EINTR);
-    }
-}
-
-# define _lib_semgive(list) sem_post(&list->sl_sem)
-#else
-# define _lib_semtake(list)
-# define _lib_semgive(list)
-#endif
-
 /************************************************************
  * Public Functions
  ************************************************************/
diff --git a/nuttx/lib/lib_libfread.c b/nuttx/lib/lib_libfread.c
index 069721d8f..92e53025d 100644
--- a/nuttx/lib/lib_libfread.c
+++ b/nuttx/lib/lib_libfread.c
@@ -43,7 +43,9 @@
 
 #include <nuttx/config.h>  /* for CONFIG_STDIO_BUFFER_SIZE */
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
+#include <fcntl.h>
 #include <errno.h>
 #include "lib_internal.h"
 
diff --git a/nuttx/lib/lib_libfwrite.c b/nuttx/lib/lib_libfwrite.c
index d53f68e2c..f62e8ddb9 100644
--- a/nuttx/lib/lib_libfwrite.c
+++ b/nuttx/lib/lib_libfwrite.c
@@ -43,6 +43,7 @@
 
 #include <nuttx/config.h>  /* for CONFIG_STDIO_BUFFER_SIZE */
 #include <stdio.h>
+#include <fcntl.h>
 #include <errno.h>
 #include "lib_internal.h"
 
diff --git a/nuttx/lib/lib_rawstream.c b/nuttx/lib/lib_rawstream.c
index dbb59ad82..8ec80bacd 100644
--- a/nuttx/lib/lib_rawstream.c
+++ b/nuttx/lib/lib_rawstream.c
@@ -37,7 +37,7 @@
  * Included Files
  ************************************************************/
 
-#include <stdio.h>
+#include <unistd.h>
 #include <errno.h>
 #include "lib_internal.h"
 
diff --git a/nuttx/lib/lib_ungetc.c b/nuttx/lib/lib_ungetc.c
index 6e246c814..fe333344c 100644
--- a/nuttx/lib/lib_ungetc.c
+++ b/nuttx/lib/lib_ungetc.c
@@ -42,8 +42,8 @@
  ************************************************************/
 
 #include <nuttx/config.h>
-
 #include <stdio.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <nuttx/fs.h>
 #include "lib_internal.h"