aboutsummaryrefslogtreecommitdiff
path: root/mach
diff options
context:
space:
mode:
Diffstat (limited to 'mach')
-rw-r--r--mach/error_compat.c22
-rw-r--r--mach/errstring.c24
-rw-r--r--mach/mach/error.h14
-rw-r--r--mach/mach/mach_traps.h4
-rw-r--r--mach/mach_error.c21
-rw-r--r--mach/mach_error.h28
-rw-r--r--mach/mach_init.c1
-rw-r--r--mach/spin-solid.c3
8 files changed, 101 insertions, 16 deletions
diff --git a/mach/error_compat.c b/mach/error_compat.c
index 0498f017ba..e874dd43d4 100644
--- a/mach/error_compat.c
+++ b/mach/error_compat.c
@@ -26,6 +26,25 @@
/* This file was broken out from:
$Log$
+ Revision 1.2 1997/03/16 17:41:36 drepper
+ (__mach_error_map_compat): Give full prototype.
+
+ Revision 1.2 1997/03/14 15:26:28 thomas
+ Wed Mar 5 10:40:05 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+
+ * mach/mach_error.c (mach_error_string_int): Give full prototype.
+ * mach/errstring.c (mach_error_string_int): Likewise.
+ * mach/error_compat.c (__mach_error_map_compat): Likewise.
+
+ * mach/spin-solid.c: Include <mach/mach_traps.h>.
+ * mach/spin-solid.c (__spin_lock_solid): Provide arg to
+ swtch_pri.
+
+ * mach/mach_init.c: Include <mach/mig_support.h>.
+
+ * mach/mach_error.h (mach_error_string, mach_error,
+ mach_error_type): Always provide prototypes.
+
Revision 1.1 1993/11/30 17:35:24 roland
entered into RCS
@@ -39,8 +58,7 @@
void
-__mach_error_map_compat( org_err )
- mach_error_t * org_err;
+__mach_error_map_compat(mach_error_t *org_err)
{
mach_error_t err = *org_err;
diff --git a/mach/errstring.c b/mach/errstring.c
index 761a615e29..e56fa728cc 100644
--- a/mach/errstring.c
+++ b/mach/errstring.c
@@ -26,6 +26,25 @@
/*
* HISTORY
* $Log$
+ * Revision 1.2 1997/03/16 17:41:48 drepper
+ * (mach_error_string_int): Give full prototype.
+ *
+ * Revision 1.2 1997/03/14 15:26:29 thomas
+ * Wed Mar 5 10:40:05 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+ *
+ * * mach/mach_error.c (mach_error_string_int): Give full prototype.
+ * * mach/errstring.c (mach_error_string_int): Likewise.
+ * * mach/error_compat.c (__mach_error_map_compat): Likewise.
+ *
+ * * mach/spin-solid.c: Include <mach/mach_traps.h>.
+ * * mach/spin-solid.c (__spin_lock_solid): Provide arg to
+ * swtch_pri.
+ *
+ * * mach/mach_init.c: Include <mach/mig_support.h>.
+ *
+ * * mach/mach_error.h (mach_error_string, mach_error,
+ * mach_error_type): Always provide prototypes.
+ *
* Revision 1.1 1993/11/30 17:35:58 roland
* entered into RCS
*
@@ -67,9 +86,8 @@ mach_error_type( err )
boolean_t mach_error_full_diag = FALSE;
const char *
-mach_error_string_int( err, diag )
- mach_error_t err;
- boolean_t * diag;
+mach_error_string_int(mach_error_t err,
+ boolean_t * diag)
{
int sub, system, code;
diff --git a/mach/mach/error.h b/mach/mach/error.h
index 83cf61ef8f..70f189f65e 100644
--- a/mach/mach/error.h
+++ b/mach/mach/error.h
@@ -27,6 +27,18 @@
/*
* HISTORY
* $Log$
+ * Revision 1.3 1997/03/16 17:43:08 drepper
+ * (mach_error_fn_t): Comment out declaration; it appears to be entirely
+ * unused dead code.
+ *
+ * Revision 1.3 1997/03/14 15:27:35 thomas
+ * Wed Mar 5 10:40:05 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+ *
+ * * mach/mach/mach_traps.h: Include <mach/kern_return.h>.
+ *
+ * * mach/mach/error.h (mach_error_fn_t): Comment out declaration; it
+ * appears to be entirely unused dead code.
+ *
* Revision 1.2 1996/12/20 01:32:36 drepper
* Update from main archive 961219
*
@@ -141,6 +153,6 @@
#define unix_err(errno) (err_kern|err_sub(3)|errno)
typedef kern_return_t mach_error_t;
-typedef mach_error_t (* mach_error_fn_t)();
+/* typedef mach_error_t (* mach_error_fn_t)(); */
#endif /* _MACH_ERROR_H_ */
diff --git a/mach/mach/mach_traps.h b/mach/mach/mach_traps.h
index 17fee75fae..fbd92dd310 100644
--- a/mach/mach/mach_traps.h
+++ b/mach/mach/mach_traps.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997 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
@@ -26,7 +26,7 @@
#define _MACH_MACH_TRAPS_H_ 1
#include <mach/port.h>
-
+#include <mach/kern_return.h>
/* Create and return a new receive right. */
extern mach_port_t mach_reply_port (void);
diff --git a/mach/mach_error.c b/mach/mach_error.c
index 6cac0a5a7c..f6f945fd73 100644
--- a/mach/mach_error.c
+++ b/mach/mach_error.c
@@ -26,6 +26,25 @@
/*
* HISTORY
* $Log$
+ * Revision 1.2 1997/03/16 17:42:02 drepper
+ * (mach_error_string_int): Give full prototype.
+ *
+ * Revision 1.2 1997/03/14 15:26:30 thomas
+ * Wed Mar 5 10:40:05 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+ *
+ * * mach/mach_error.c (mach_error_string_int): Give full prototype.
+ * * mach/errstring.c (mach_error_string_int): Likewise.
+ * * mach/error_compat.c (__mach_error_map_compat): Likewise.
+ *
+ * * mach/spin-solid.c: Include <mach/mach_traps.h>.
+ * * mach/spin-solid.c (__spin_lock_solid): Provide arg to
+ * swtch_pri.
+ *
+ * * mach/mach_init.c: Include <mach/mig_support.h>.
+ *
+ * * mach/mach_error.h (mach_error_string, mach_error,
+ * mach_error_type): Always provide prototypes.
+ *
* Revision 1.1 1992/10/06 18:29:54 roland
* entered into RCS
*
@@ -63,7 +82,7 @@
#include <mach_error.h>
#include <mach/boolean.h>
-extern char * mach_error_string_int();
+extern char * mach_error_string_int(mach_error_t, boolean_t *);
void
mach_error( str, err )
diff --git a/mach/mach_error.h b/mach/mach_error.h
index 852ab4e622..f88d1732e8 100644
--- a/mach/mach_error.h
+++ b/mach/mach_error.h
@@ -26,6 +26,28 @@
/*
* HISTORY
* $Log$
+ * Revision 1.3 1997/03/16 17:42:25 drepper
+ * (mach_error_string, mach_error, mach_error_type): Always provide
+ * prototypes.
+ * (mach_error_fn_t): Comment out declaration; it appears to be entirely
+ * unused dead code.
+ *
+ * Revision 1.3 1997/03/14 15:26:31 thomas
+ * Wed Mar 5 10:40:05 1997 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
+ *
+ * * mach/mach_error.c (mach_error_string_int): Give full prototype.
+ * * mach/errstring.c (mach_error_string_int): Likewise.
+ * * mach/error_compat.c (__mach_error_map_compat): Likewise.
+ *
+ * * mach/spin-solid.c: Include <mach/mach_traps.h>.
+ * * mach/spin-solid.c (__spin_lock_solid): Provide arg to
+ * swtch_pri.
+ *
+ * * mach/mach_init.c: Include <mach/mig_support.h>.
+ *
+ * * mach/mach_error.h (mach_error_string, mach_error,
+ * mach_error_type): Always provide prototypes.
+ *
* Revision 1.2 1993/11/23 20:39:08 mib
* entered into RCS
*
@@ -53,28 +75,22 @@ const char *mach_error_string(
/*
* Returns a string appropriate to the error argument given
*/
-#if c_plusplus
mach_error_t error_value
-#endif c_plusplus
);
void mach_error(
/*
* Prints an appropriate message on the standard error stream
*/
-#if c_plusplus
char *str,
mach_error_t error_value
-#endif c_plusplus
);
const char *mach_error_type(
/*
* Returns a string with the error system, subsystem and code
*/
-#if c_plusplus
mach_error_t error_value
-#endif c_plusplus
);
#endif _MACH_ERROR_
diff --git a/mach/mach_init.c b/mach/mach_init.c
index db340fff2d..eb8ed9b046 100644
--- a/mach/mach_init.c
+++ b/mach/mach_init.c
@@ -18,6 +18,7 @@
#include <mach_init.h>
#include <mach/mach_interface.h>
+#include <mach/mig_support.h>
mach_port_t __mach_task_self_;
vm_size_t __vm_page_size = 0; /* Must be data not bss for weak alias. */
diff --git a/mach/spin-solid.c b/mach/spin-solid.c
index a98578552e..93f6ff79e4 100644
--- a/mach/spin-solid.c
+++ b/mach/spin-solid.c
@@ -17,12 +17,13 @@
Boston, MA 02111-1307, USA. */
#include <spin-lock.h>
+#include <mach/mach_traps.h>
void
__spin_lock_solid (spin_lock_t *lock)
{
while (__spin_lock_locked (lock) || ! __spin_try_lock (lock))
/* Yield to another thread (system call). */
- __swtch_pri ();
+ __swtch_pri (0);
}
weak_alias (__spin_lock_solid, spin_lock_solid);