* sysdeps/mach/sys/reboot.h: Include <features.h>.

	(reboot): Declare it.

diff --git a/ChangeLog b/ChangeLog
index 522ad5726b3bbf73953432486b114f50f5edc494..e2286693315d7b4d8ce0e793a0ac0e1d9567989b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-26  Roland McGrath  <roland@baalperazim.frob.com>
 
+       * sysdeps/mach/sys/reboot.h: Include <features.h>.
+       (reboot): Declare it.
+
        * libio/Makefile (headers): Add bits/stdio-lock.h here.
 
        * sysdeps/mach/hurd/bits/stdio-lock.h: New file.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 013e640831e5a5a4eb6b9c1a41e3a4589654eaab..055a69a7dd311a5a52f1c9a91acd3efd9e92d262 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-26  Roland McGrath  <roland@baalperazim.frob.com>
+
+       * sysdeps/pthread/Makefile: File removed.
+
 2000-03-23  Ulrich Drepper  <drepper@redhat.com>
 
        * mutex.c (__pthread_reset_pthread_once): Reset once_masterlock.

diff --git a/sysdeps/mach/hurd/bits/stdio-lock.h b/sysdeps/mach/hurd/bits/stdio-lock.h
index 1f67542c427d8d3dd5fcb3ce353c51819fb71934..ed55c96fd94eb6932d00bab8cdd7ffe78d0522ab 100644 (file)
--- a/sysdeps/mach/hurd/bits/stdio-lock.h
+++ b/sysdeps/mach/hurd/bits/stdio-lock.h
@@ -50,13 +50,14 @@ typedef struct _IO_cthreads_lock _IO_lock_t;
 #define _IO_lock_lock(_name) __libc_lock_lock ((_name).mutex)
 #define _IO_lock_unlock(_name) __libc_lock_unlock ((_name).mutex)
 
-
+#ifdef _LIBC
 #include <bits/libc-lock.h>
 
 #define _IO_cleanup_region_start(_fct, _fp) \
      __libc_cleanup_region_start (_fct, _fp)
 #define _IO_cleanup_region_end(_doit) \
      __libc_cleanup_region_end (_doit)
+#endif
 
 
 #endif /* bits/stdio-lock.h */

diff --git a/sysdeps/mach/sys/reboot.h b/sysdeps/mach/sys/reboot.h
index 1a2a5f56b26f7dd6aff5991152a16bb2a6cd91d5..be0acb6c2db8dc0c43b8c514585d081d981e9a2d 100644 (file)
--- a/sysdeps/mach/sys/reboot.h
+++ b/sysdeps/mach/sys/reboot.h
@@ -1,31 +1,37 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1993,1991,1990 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 /*
  * HISTORY
  * $Log$
+ * Revision 1.3  2000/03/27 04:09:08  roland
+ * 2000-03-26  Roland McGrath  <roland@baalperazim.frob.com>
+ *
+ *     * sysdeps/mach/sys/reboot.h: Include <features.h>.
+ *     (reboot): Declare it.
+ *
  * Revision 1.2  1998/05/29 10:19:59  drepper
  * Use __ASSEMBLER__ test macro not ASSEMBLER.
  *
@@ -35,30 +41,30 @@
  * Revision 2.8  93/03/11  13:46:40  danner
  *     u_long -> u_int.
  *     [93/03/09            danner]
- * 
+ *
  * Revision 2.7  92/05/21  17:25:11  jfriedl
  *     Appended 'U' to constants that would otherwise be signed.
  *     [92/05/16            jfriedl]
- * 
+ *
  * Revision 2.6  91/06/19  11:59:44  rvb
  *     Second byte of boothowto is flags for "startup" program.
  *     [91/06/18            rvb]
  *     Add ifndef __ASSEMBLER__ so that vax_init.s can include it.
  *     [91/06/11            rvb]
- * 
+ *
  * Revision 2.5  91/05/14  17:40:11  mrt
  *     Correcting copyright
- * 
+ *
  * Revision 2.4  91/02/05  17:56:48  mrt
  *     Changed to new Mach copyright
  *     [91/02/01  17:49:12  mrt]
- * 
+ *
  * Revision 2.3  90/08/27  22:12:56  dbg
  *     Added definitions used by Mach Kernel: RB_DEBUGGER, RB_UNIPROC,
  *     RB_NOBOOTRC, RB_ALTBOOT.  Moved RB_KDB to 0x04 (Mach value).
  *     Removed RB_RDONLY, RB_DUMP, RB_NOSYNC.
  *     [90/08/14            dbg]
- * 
+ *
  */
 
 /*
@@ -83,6 +89,8 @@
 #ifndef        _SYS_REBOOT_H_
 #define        _SYS_REBOOT_H_
 
+#include <features.h>
+
 /*
  * Arguments to reboot system call.
  * These are converted to switches, and passed to startup program,
@@ -150,4 +158,12 @@ extern int boothowto;
 #endif /* __ASSEMBLER__ */
 #endif
 
+__BEGIN_DECLS
+
+/* Reboot or halt the system.  */
+extern int reboot (int __howto) __THROW;
+
+__END_DECLS
+
+
 #endif /* _SYS_REBOOT_H_ */