*** empty log message *** cvs/libc-960913

	* sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/.
	* sysdeps/mach/hurd/Makefile (includes): Add
	-I$(common-objpfx)hurd/.  Reported by Marcus Daniels.

7 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 731f3a9361..047d0a9f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Fri Sep 13 01:21:36 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
 
+	* sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/.
+	* sysdeps/mach/hurd/Makefile (includes): Add
+	-I$(common-objpfx)hurd/.  Reported by Marcus Daniels.
+
 	* sysdeps/generic/schedbits.h (struct sched_param): Renamed from
 	struct sched_params.
 	* sysdeps/stub/sched_setp.c (__sched_setparam): struct
diff --git a/sysdeps/generic/schedbits.h b/sysdeps/generic/schedbits.h
index 21ea377995..e2cb00e842 100644
--- a/sysdeps/generic/schedbits.h
+++ b/sysdeps/generic/schedbits.h
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #define SCHED_RR	2
 
 /* Data structure to describe a process' schedulability.  */
-struct sched_params
+struct sched_param
 {
   int sched_priority;
 };
diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile
index 2f2a12cb3b..e035d5a82a 100644
--- a/sysdeps/mach/Makefile
+++ b/sysdeps/mach/Makefile
@@ -19,7 +19,8 @@
 ifdef in-Makerules
 
 # Look for header files in mach/ under the top-level library source directory.
-includes += -I$(..)mach
+# Look for generated header files where they get created.
+includes += -I$(..)mach -I$(common-objpfx)mach/
 
 ifneq (mach,$(subdir))
 # Subdirectories other than mach/ might use the generated Mach headers.
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 1fe99f3125..c33cb7d5fe 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -21,7 +21,8 @@ ifdef in-Makerules
 subdirs := $(filter-out sunrpc,$(subdirs)) # XXX skip broken dirs
 
 # Look for header files in hurd/ under the top-level library source directory.
-includes += -I$(..)hurd
+# Look for generated header files where they get created.
+includes += -I$(..)hurd -I$(common-objpfx)hurd/
 
 # Do not use any assembly code from sysdeps/unix (and subdirectories).
 # This bypasses all the system call stubs and uses any existing posix or
diff --git a/sysdeps/stub/sched_getp.c b/sysdeps/stub/sched_getp.c
index 3fc0b458c1..0da92bcd2c 100644
--- a/sysdeps/stub/sched_getp.c
+++ b/sysdeps/stub/sched_getp.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Retrieve scheduling parameters for a particular process.  */
 int
-__sched_getparam (pid_t pid, struct sched_params *param)
+__sched_getparam (pid_t pid, struct sched_param *param)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/stub/sched_setp.c b/sysdeps/stub/sched_setp.c
index 10b0cb3c6c..513c717b03 100644
--- a/sysdeps/stub/sched_setp.c
+++ b/sysdeps/stub/sched_setp.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Set scheduling parameters for a process.  */
 int
-__sched_setparam (pid_t pid, const struct sched_params *param)
+__sched_setparam (pid_t pid, const struct sched_param *param)
 {
   errno = ENOSYS;
   return -1;
diff --git a/sysdeps/stub/sched_sets.c b/sysdeps/stub/sched_sets.c
index 99113b1ad7..98008e6138 100644
--- a/sysdeps/stub/sched_sets.c
+++ b/sysdeps/stub/sched_sets.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Set scheduling algorithm and/or parameters for a process.  */
 int
-__sched_setscheduler (pid_t pid, int policy, const struct sched_params *param)
+__sched_setscheduler (pid_t pid, int policy, const struct sched_param *param)
 {
   errno = ENOSYS;
   return -1;