diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/wait4.c | 9 | ||||
| -rw-r--r-- | sysdeps/mach/mips/sysdep.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/sys/reboot.h | 10 | ||||
| -rw-r--r-- | sysdeps/mach/sysdep.h | 4 |
4 files changed, 11 insertions, 14 deletions
diff --git a/sysdeps/mach/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c index 8d29875032..0b505ba0d8 100644 --- a/sysdeps/mach/hurd/wait4.c +++ b/sysdeps/mach/hurd/wait4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 94, 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,11 +23,8 @@ #include <hurd/port.h> pid_t -__wait4 (pid, stat_loc, options, usage) - pid_t pid; - __WAIT_STATUS_DEFN stat_loc; - int options; - struct rusage *usage; +__wait4 (pid_t pid, __WAIT_STATUS_DEFN stat_loc, int options, + struct rusage *usage) { pid_t dead; error_t err; diff --git a/sysdeps/mach/mips/sysdep.h b/sysdeps/mach/mips/sysdep.h index a4e6dff148..7bacb02cf4 100644 --- a/sysdeps/mach/mips/sysdep.h +++ b/sysdeps/mach/mips/sysdep.h @@ -57,7 +57,7 @@ _start:\n\ #include <syscall.h> -#if defined (ASSEMBLER) +#if defined (__ASSEMBLER__) #define ALIGN 2 diff --git a/sysdeps/mach/sys/reboot.h b/sysdeps/mach/sys/reboot.h index 6435fea00c..1a2a5f56b2 100644 --- a/sysdeps/mach/sys/reboot.h +++ b/sysdeps/mach/sys/reboot.h @@ -26,8 +26,8 @@ /* * HISTORY * $Log$ - * Revision 1.1 1993/08/03 22:25:15 roland - * entered into RCS + * Revision 1.2 1998/05/29 10:19:59 drepper + * Use __ASSEMBLER__ test macro not ASSEMBLER. * * Revision 1.1 1993/08/03 22:25:15 roland * entered into RCS @@ -43,7 +43,7 @@ * 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. + * 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 @@ -145,9 +145,9 @@ #ifdef KERNEL -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ extern int boothowto; -#endif ASSEMBLER +#endif /* __ASSEMBLER__ */ #endif #endif /* _SYS_REBOOT_H_ */ diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h index 6b09fcf684..123e7105da 100644 --- a/sysdeps/mach/sysdep.h +++ b/sysdeps/mach/sysdep.h @@ -16,7 +16,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef ASSEMBLER +#ifdef __ASSEMBLER__ /* Get the Mach definitions of ENTRY and kernel_trap. */ #include <mach/machine/syscall_sw.h> @@ -45,7 +45,7 @@ try to do anything else. Just to be safe, deallocate the reply port so bogons arriving on it don't foul up future RPCs. */ -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ #define FATAL_PREPARE_INCLUDE <mach/mig_support.h> #define FATAL_PREPARE __mig_dealloc_reply_port (MACH_PORT_NULL) #endif |