Use proper include for libio.h.

1999-03-16 01:41:16 +00:00
parent e602b3f845
commit 23c4bbf58a
18 changed files with 18 additions and 36 deletions
--- a/c/src/exec/include/rtems/libio_.h
+++ b/c/src/exec/include/rtems/libio_.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif

 #include <rtems.h>
+#include <rtems/libio.h>                /* include before standard IO */
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-#include <rtems/libio.h>

 #include <stdio.h>                      /* O_RDONLY, et.al. */
 #include <fcntl.h>                      /* O_RDONLY, et.al. */
@@ -46,9 +46,6 @@ extern "C" {
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-
 /*
 *  Semaphore to protect the io table
 */
--- a/c/src/exec/libcsupport/include/rtems/libio_.h
+++ b/c/src/exec/libcsupport/include/rtems/libio_.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif

 #include <rtems.h>
+#include <rtems/libio.h>                /* include before standard IO */
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-#include <rtems/libio.h>

 #include <stdio.h>                      /* O_RDONLY, et.al. */
 #include <fcntl.h>                      /* O_RDONLY, et.al. */
@@ -46,9 +46,6 @@ extern "C" {
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-
 /*
 *  Semaphore to protect the io table
 */
--- a/c/src/exec/libcsupport/src/libio.c
+++ b/c/src/exec/libcsupport/src/libio.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
+#include <rtems/libio.h>                /* libio.h not pulled in by rtems */

 /*                            
 *  File descriptor Table Information
--- a/c/src/exec/libcsupport/src/tcdrain.c
+++ b/c/src/exec/libcsupport/src/tcdrain.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>

 int tcdrain(
  int fd
--- a/c/src/exec/libcsupport/src/tcgetattr.c
+++ b/c/src/exec/libcsupport/src/tcgetattr.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>

 int tcgetattr(
  int fd,
--- a/c/src/exec/libcsupport/src/tcsetattr.c
+++ b/c/src/exec/libcsupport/src/tcsetattr.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>
 #include "libio_.h"

 int tcsetattr(
--- a/c/src/lib/include/rtems/libio_.h
+++ b/c/src/lib/include/rtems/libio_.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif

 #include <rtems.h>
+#include <rtems/libio.h>                /* include before standard IO */
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-#include <rtems/libio.h>

 #include <stdio.h>                      /* O_RDONLY, et.al. */
 #include <fcntl.h>                      /* O_RDONLY, et.al. */
@@ -46,9 +46,6 @@ extern "C" {
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-
 /*
 *  Semaphore to protect the io table
 */
--- a/c/src/lib/libc/libio.c
+++ b/c/src/lib/libc/libio.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
+#include <rtems/libio.h>                /* libio.h not pulled in by rtems */

 /*                            
 *  File descriptor Table Information
--- a/c/src/lib/libc/libio_.h
+++ b/c/src/lib/libc/libio_.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif

 #include <rtems.h>
+#include <rtems/libio.h>                /* include before standard IO */
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-#include <rtems/libio.h>

 #include <stdio.h>                      /* O_RDONLY, et.al. */
 #include <fcntl.h>                      /* O_RDONLY, et.al. */
@@ -46,9 +46,6 @@ extern "C" {
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-
 /*
 *  Semaphore to protect the io table
 */
--- a/c/src/lib/libc/tcdrain.c
+++ b/c/src/lib/libc/tcdrain.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>

 int tcdrain(
  int fd
--- a/c/src/lib/libc/tcgetattr.c
+++ b/c/src/lib/libc/tcgetattr.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>

 int tcgetattr(
  int fd,
--- a/c/src/lib/libc/tcsetattr.c
+++ b/c/src/lib/libc/tcsetattr.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>
 #include "libio_.h"

 int tcsetattr(
--- a/cpukit/include/rtems/libio_.h
+++ b/cpukit/include/rtems/libio_.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif

 #include <rtems.h>
+#include <rtems/libio.h>                /* include before standard IO */
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-#include <rtems/libio.h>

 #include <stdio.h>                      /* O_RDONLY, et.al. */
 #include <fcntl.h>                      /* O_RDONLY, et.al. */
@@ -46,9 +46,6 @@ extern "C" {
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-
 /*
 *  Semaphore to protect the io table
 */
--- a/cpukit/libcsupport/include/rtems/libio_.h
+++ b/cpukit/libcsupport/include/rtems/libio_.h
@@ -20,8 +20,8 @@ extern "C" {
 #endif

 #include <rtems.h>
+#include <rtems/libio.h>                /* include before standard IO */
 #include <rtems/assoc.h>                /* assoc.h not included by rtems.h */
-#include <rtems/libio.h>

 #include <stdio.h>                      /* O_RDONLY, et.al. */
 #include <fcntl.h>                      /* O_RDONLY, et.al. */
@@ -46,9 +46,6 @@ extern "C" {
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
-
-
 /*
 *  Semaphore to protect the io table
 */
--- a/cpukit/libcsupport/src/libio.c
+++ b/cpukit/libcsupport/src/libio.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <stdlib.h>                     /* calloc() */

-#include "libio.h"                      /* libio.h not pulled in by rtems */
+#include <rtems/libio.h>                /* libio.h not pulled in by rtems */

 /*                            
 *  File descriptor Table Information
--- a/cpukit/libcsupport/src/tcdrain.c
+++ b/cpukit/libcsupport/src/tcdrain.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>

 int tcdrain(
  int fd
--- a/cpukit/libcsupport/src/tcgetattr.c
+++ b/cpukit/libcsupport/src/tcgetattr.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>

 int tcgetattr(
  int fd,
--- a/cpukit/libcsupport/src/tcsetattr.c
+++ b/cpukit/libcsupport/src/tcsetattr.c
@@ -21,7 +21,7 @@
 #include <termios.h>
 #include <sys/ioctl.h>

-#include "libio.h"
+#include <rtems/libio.h>
 #include "libio_.h"

 int tcsetattr(