summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1995-09-22 19:44:42 +0000
committerMichael I. Bushnell <mib@gnu.org>1995-09-22 19:44:42 +0000
commitc4928554295f404fdb263e36e2770aa4a369cf12 (patch)
tree93a2da7356f3d3698dfc7c462e27a4a9a6e30e18
parentb7930c4618f93af20e2d69c366153ebdcddbef97 (diff)
(sigmask): New macro.
(__mig_dealloc_reply_port): Remove __ from call to mach_port_mod_refs. (main): Check for `d' in BOOTSTRAP_ARGS, not BOOT_ARGS. Don't declar MSG static.
-rw-r--r--boot/boot.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/boot/boot.c b/boot/boot.c
index 02715ca4..8a0b02dc 100644
--- a/boot/boot.c
+++ b/boot/boot.c
@@ -80,6 +80,9 @@ char *bootdevice = "sd0a";
extern void __mach_init ();
void (*mach_init_routine)() = __mach_init;
+#define sigmask(m) (1 << ((m)-1))
+
+
/* We can't include <unistd.h> for this, because that will fight witho
our definitions of syscalls below. */
int syscall (int, ...);
@@ -133,8 +136,8 @@ void mig_put_reply_port (mach_port_t port)
}
void __mig_dealloc_reply_port (mach_port_t port)
{
- __mach_port_mod_refs (__mach_task_self (), port,
- MACH_PORT_RIGHT_RECEIVE, -1);
+ mach_port_mod_refs (__mach_task_self (), port,
+ MACH_PORT_RIGHT_RECEIVE, -1);
}
void mig_dealloc_reply_port (mach_port_t port)
{
@@ -653,9 +656,9 @@ main (int argc, char **argv, char **envp)
}
}
- if (index (boot_args, 'd'))
+ if (index (bootstrap_args, 'd'))
{
- const char msg[] = "Pausing. . .";
+ char msg[] = "Pausing. . .";
char c;
write (2, msg, sizeof (msg) - 1);
read (0, &c, 1);