4 files changed, 8 insertions, 20 deletions
diff --git a/c/src/exec/libcsupport/src/read.c b/c/src/exec/libcsupport/src/read.c
index 1ed6a0bd00..52f61d9b50 100644
--- a/c/src/exec/libcsupport/src/read.c
+++ b/c/src/exec/libcsupport/src/read.c
@@ -14,13 +14,10 @@
 
 #include "libio_.h"
 
-/* XXX newlib has the prototype for this wrong.  It will be a bit painful */
-/* XXX to fix so we are choosing to delay fixing this. */
-
-int read(
+ssize_t read(
   int         fd,
   void       *buffer,
-  unsigned32  count
+  size_t      count
 )
 {
   int             rc;  /* XXX change to a size_t when prototype is fixed */
diff --git a/c/src/exec/libcsupport/src/write.c b/c/src/exec/libcsupport/src/write.c
index 3de21f0d0f..4b4d076185 100644
--- a/c/src/exec/libcsupport/src/write.c
+++ b/c/src/exec/libcsupport/src/write.c
@@ -22,13 +22,10 @@
  * to the file associated with the open file descriptor, fildes.
  */
 
-/* XXX newlib has the prototype for this wrong.  It will be a bit painful */
-/* XXX to fix so we are choosing to delay fixing this. */
-
-int write(                        /* XXX this should return a ssize_t */
+ssize_t write(
   int         fd,
   const void *buffer,
-  unsigned32  count               /* XXX this should be a size_t */
+  size_t      count
 )
 {
   rtems_status_code  rc;
diff --git a/c/src/lib/libc/read.c b/c/src/lib/libc/read.c
index 1ed6a0bd00..52f61d9b50 100644
--- a/c/src/lib/libc/read.c
+++ b/c/src/lib/libc/read.c
@@ -14,13 +14,10 @@
 
 #include "libio_.h"
 
-/* XXX newlib has the prototype for this wrong.  It will be a bit painful */
-/* XXX to fix so we are choosing to delay fixing this. */
-
-int read(
+ssize_t read(
   int         fd,
   void       *buffer,
-  unsigned32  count
+  size_t      count
 )
 {
   int             rc;  /* XXX change to a size_t when prototype is fixed */
diff --git a/c/src/lib/libc/write.c b/c/src/lib/libc/write.c
index 3de21f0d0f..4b4d076185 100644
--- a/c/src/lib/libc/write.c
+++ b/c/src/lib/libc/write.c
@@ -22,13 +22,10 @@
  * to the file associated with the open file descriptor, fildes.
  */
 
-/* XXX newlib has the prototype for this wrong.  It will be a bit painful */
-/* XXX to fix so we are choosing to delay fixing this. */
-
-int write(                        /* XXX this should return a ssize_t */
+ssize_t write(
   int         fd,
   const void *buffer,
-  unsigned32  count               /* XXX this should be a size_t */
+  size_t      count
 )
 {
   rtems_status_code  rc;