Fri Nov 15 12:27:25 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>

	* sysdeps/posix/readv.c (readv): Change return type to ssize_t.
  	Deansideclized.
	* sysdeps/posix/writev.c (writev): Likewise.

4 files changed, 10 insertions, 24 deletions

diff --git a/stdio/fopen.c b/stdio/fopen.c
index fea227482f..fa50f6af98 100644
--- a/stdio/fopen.c
+++ b/stdio/fopen.c
@@ -27,9 +27,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Dissect the given mode string into an __io_mode.  */
 int
-__getmode (mode, mptr)
-     const char *mode;
-     __io_mode *mptr;
+__getmode (const char *mode, __io_mode *mptr)
 {
   register unsigned char i;
 
diff --git a/stdio/internals.c b/stdio/internals.c
index 8c2acc4026..8ec731fa62 100644
--- a/stdio/internals.c
+++ b/stdio/internals.c
@@ -24,8 +24,7 @@ Cambridge, MA 02139, USA.  */
 
 /* Make sure that FP has its functions set.  */
 void
-__stdio_check_funcs (fp)
-     register FILE *fp;
+__stdio_check_funcs (register FILE *fp)
 {
   if (!fp->__seen)
     {
@@ -51,8 +50,7 @@ __stdio_check_funcs (fp)
 /* Figure out what kind of buffering (none, line, or full)
    and what buffer size to give FP.  */
 static void
-init_stream (fp)
-     register FILE *fp;
+init_stream (register FILE *fp)
 {
   __stdio_check_funcs (fp);
 
@@ -141,8 +139,7 @@ __stdio_check_offset (stream)
    seeking as necessary and updating its `offset' field.
    Sets ferror(FP) (and possibly errno) for errors.  */
 static void
-seek_to_target (fp)
-     FILE *fp;
+seek_to_target (FILE *fp)
 {
   int save = errno;
   if (__stdio_check_offset (fp) == EOF)
@@ -197,9 +194,7 @@ seek_to_target (fp)
    flushed to avoid a system call for a single character.
    This is the default `output room' function.  */
 static void
-flushbuf (fp, c)
-     register FILE *fp;
-     int c;
+flushbuf (register FILE *fp, int c)
 {
   int flush_only = c == EOF;
   size_t buffer_written;
@@ -394,8 +389,7 @@ flushbuf (fp, c)
 /* Fill the buffer for FP and return the first character read (or EOF).
    This is the default `input_room' function.  */
 static int
-fillbuf (fp)
-     register FILE *fp;
+fillbuf (register FILE *fp)
 {
   /* How far into the buffer we read we want to start bufp.  */
   size_t buffer_offset = 0;
diff --git a/stdio/memstream.c b/stdio/memstream.c
index ab285f4624..304cc4ca85 100644
--- a/stdio/memstream.c
+++ b/stdio/memstream.c
@@ -29,9 +29,7 @@ struct memstream_info
 
 /* Enlarge STREAM's buffer.  */
 static void
-enlarge_buffer (stream, c)
-     register FILE *stream;
-     int c;
+enlarge_buffer (register FILE *stream, int c)
 {
   struct memstream_info *info = (struct memstream_info *) stream->__cookie;
   size_t need;
@@ -96,10 +94,7 @@ enlarge_buffer (stream, c)
    There is no external state to munge.  */
 
 static int
-seek (cookie, pos, whence)
-     void *cookie;
-     fpos_t *pos;
-     int whence;
+seek (void *cookie, fpos_t *pos, int whence)
 {
   switch (whence)
     {
@@ -120,8 +115,7 @@ seek (cookie, pos, whence)
 }
 
 static int
-free_info (cookie)
-     void *cookie;
+free_info (void *cookie)
 {
 #if 0
   struct memstream_info *info = (struct memstream_info *) cookie;
diff --git a/stdio/stdio.h b/stdio/stdio.h
index 083caa405e..bf4f7b818c 100644
--- a/stdio/stdio.h
+++ b/stdio/stdio.h
@@ -302,7 +302,7 @@ extern char *tmpnam_r __P ((char *__s));
 #endif
 
 
-#if def(__USE_SVID) || defined(__USE_XOPEN)
+#if defined(__USE_SVID) || defined(__USE_XOPEN)
 /* Generate a unique temporary filename using up to five characters of PFX
    if it is not NULL.  The directory to put this file in is searched for
    as follows: First the environment variable "TMPDIR" is checked.