1998-09-03 Roland McGrath <roland@baalperazim.frob.com>

	* mach/Makefile: Use -include for mach-syscalls.mk to silence warning.

	* sysdeps/mach/hurd/sysd-stdio.c: Declare fns
	__stdio_{read,write,seek,close,fileno} using __io_*_fn types.
	* sysdeps/generic/sysd-stdio.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 929c41a..66c58c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1998-09-03  Roland McGrath  <roland@baalperazim.frob.com>
+
+       * mach/Makefile: Use -include for mach-syscalls.mk to silence warning.
+
+       * sysdeps/mach/hurd/sysd-stdio.c: Declare fns
+       __stdio_{read,write,seek,close,fileno} using __io_*_fn types.
+       * sysdeps/generic/sysd-stdio.c: Likewise.
+
 1998-09-02  Ulrich Drepper  <drepper@cygnus.com>
 
        * elf/dl-load.c (fillin_rpath): Handle "/" as RPATH correctly.

diff --git a/sysdeps/generic/sysd-stdio.c b/sysdeps/generic/sysd-stdio.c
index da8ed20..479f152 100644 (file)
--- a/sysdeps/generic/sysd-stdio.c
+++ b/sysdeps/generic/sysd-stdio.c
@@ -26,6 +26,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+extern __io_read_fn __stdio_read;
+extern __io_write_fn __stdio_write;
+extern __io_seek_fn __stdio_seek;
+extern __io_close_fn __stdio_close;
+extern __io_fileno_fn __stdio_fileno;
+
 /* Read N bytes into BUF from COOKIE.  */
 int
 __stdio_read (void *cookie, char *buf, size_t n)

diff --git a/sysdeps/mach/hurd/sysd-stdio.c b/sysdeps/mach/hurd/sysd-stdio.c
index 9d56473..d12804a 100644 (file)
--- a/sysdeps/mach/hurd/sysd-stdio.c
+++ b/sysdeps/mach/hurd/sysd-stdio.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 95, 96, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,9 +23,14 @@
 #include <fcntl.h>
 #include <hurd/fd.h>
 
-/* Check ERR for wanting to generate a signal.  */
+extern __io_read_fn __stdio_read;
+extern __io_write_fn __stdio_write;
+extern __io_seek_fn __stdio_seek;
+extern __io_close_fn __stdio_close;
+extern __io_fileno_fn __stdio_fileno;
+
 
-int __stdio_fileno (void *);
+/* Check ERR for wanting to generate a signal.  */
 
 static inline int
 fd_fail (struct hurd_fd *fd, error_t err)