7 files changed, 15 insertions, 6 deletions
diff --git a/sysdeps/mach/hurd/sysd-stdio.c b/sysdeps/mach/hurd/sysd-stdio.c
index 85dd04bad4..c4bcf73d9b 100644
--- a/sysdeps/mach/hurd/sysd-stdio.c
+++ b/sysdeps/mach/hurd/sysd-stdio.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1996 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
@@ -34,7 +34,11 @@ fd_fail (struct hurd_fd *fd, error_t err)
 {
   int signo = _hurd_fd_error_signal (err);
   if (signo)
-    _hurd_raise_signal (NULL, signo, __stdio_fileno (fd), err);
+    {
+      const struct hurd_signal_detail detail
+	= { code: __stdio_fileno (fd), error: err, exc: 0 };
+      _hurd_raise_signal (NULL, signo, &detail);
+    }
   errno = err;
   return -1;
 }
diff --git a/sysdeps/stub/sched_getp.c b/sysdeps/stub/sched_getp.c
index 081458a1b6..3fc0b458c1 100644
--- a/sysdeps/stub/sched_getp.c
+++ b/sysdeps/stub/sched_getp.c
@@ -17,12 +17,13 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
+#include <sys/types.h>
 #include <sched.h>
 
 
 /* Retrieve scheduling parameters for a particular process.  */
 int
-__sched_getparam (pid_t pid, struct sched_param *param)
+__sched_getparam (pid_t pid, struct sched_params *param)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/stub/sched_gets.c b/sysdeps/stub/sched_gets.c
index 4cbfb0e76b..bb64838908 100644
--- a/sysdeps/stub/sched_gets.c
+++ b/sysdeps/stub/sched_gets.c
@@ -18,6 +18,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
 #include <sched.h>
+#include <sys/types.h>
 
 
 /* Retrieve scheduling algorithm for a particular purpose.  */
diff --git a/sysdeps/stub/sched_rr_gi.c b/sysdeps/stub/sched_rr_gi.c
index 27344e0dc3..b818561287 100644
--- a/sysdeps/stub/sched_rr_gi.c
+++ b/sysdeps/stub/sched_rr_gi.c
@@ -18,6 +18,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
 #include <sched.h>
+#include <sys/types.h>
 
 
 /* Get the SCHED_RR interval for the named process.  */
diff --git a/sysdeps/stub/sched_setp.c b/sysdeps/stub/sched_setp.c
index 2830618700..10b0cb3c6c 100644
--- a/sysdeps/stub/sched_setp.c
+++ b/sysdeps/stub/sched_setp.c
@@ -17,12 +17,13 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
+#include <sys/types.h>
 #include <sched.h>
 
 
 /* Set scheduling parameters for a process.  */
 int
-__sched_setparam (pid_t pid, const struct sched_param *param)
+__sched_setparam (pid_t pid, const struct sched_params *param)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/stub/sched_sets.c b/sysdeps/stub/sched_sets.c
index e013e7a554..99113b1ad7 100644
--- a/sysdeps/stub/sched_sets.c
+++ b/sysdeps/stub/sched_sets.c
@@ -18,11 +18,12 @@ Boston, MA 02111-1307, USA.  */
 
 #include <errno.h>
 #include <sched.h>
+#include <sys/types.h>
 
 
 /* Set scheduling algorithm and/or parameters for a process.  */
 int
-__sched_setscheduler (pid_t pid, int policy, const struct sched_param *param)
+__sched_setscheduler (pid_t pid, int policy, const struct sched_params *param)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h
index 5c59095bbe..375ededb8a 100644
--- a/sysdeps/unix/sysv/linux/sys/mman.h
+++ b/sysdeps/unix/sysv/linux/sys/mman.h
@@ -89,7 +89,7 @@ int mlock __P ((__caddr_t __addr, size_t __len));
 int munlock __P ((__caddr_t __addr, size_t __len));
 
 /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
-   NEW_LEN.  If MAY_MOVE is MREMAP_MAXMOVE the returned address may
+   NEW_LEN.  If MAY_MOVE is MREMAP_MAYMOVE the returned address may
    differ from ADDR.  */
 __caddr_t __mremap __P ((__caddr_t __addr, size_t __old_len, size_t __new_len,
 			 int __may_move));