diff options
author | phk <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-08-09 10:35:05 +0000 |
commit | ee871b6440719fbe58a0cb8e994ad543265f4e1a (patch) | |
tree | 5e644fe7bdaf6b601abb674aac52092ad3fd8b45 /sys/ddb | |
parent | f0f8bd1b55697613d6f80eb5c65838ecc4b246e6 (diff) | |
download | FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.zip FreeBSD-src-ee871b6440719fbe58a0cb8e994ad543265f4e1a.tar.gz |
Merge the cons.c and cons.h to the best of my ability. alpha may or
may not compile, I can't test it.
Diffstat (limited to 'sys/ddb')
-rw-r--r-- | sys/ddb/db_command.c | 5 | ||||
-rw-r--r-- | sys/ddb/db_input.c | 5 | ||||
-rw-r--r-- | sys/ddb/db_output.c | 4 | ||||
-rw-r--r-- | sys/ddb/db_ps.c | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index e5a9f03..53c79c6 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_command.c,v 1.31 1999/05/09 10:51:03 phk Exp $ + * $Id: db_command.c,v 1.32 1999/07/01 19:42:55 peter Exp $ */ /* @@ -38,8 +38,7 @@ #include <sys/linker_set.h> #include <sys/reboot.h> #include <sys/systm.h> - -#include <machine/cons.h> +#include <sys/cons.h> #include <ddb/ddb.h> #include <ddb/db_command.h> diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index a9797d2..b17bdff 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_input.c,v 1.23 1997/12/05 05:36:58 dyson Exp $ + * $Id: db_input.c,v 1.24 1999/07/14 10:53:41 yokota Exp $ */ /* @@ -33,8 +33,7 @@ #include <sys/param.h> #include <sys/systm.h> - -#include <machine/cons.h> +#include <sys/cons.h> #include <ddb/ddb.h> #include <ddb/db_output.h> diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index 4959154..3318322 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: db_output.c,v 1.23 1998/06/07 17:09:37 dfr Exp $ + * $Id: db_output.c,v 1.24 1998/07/08 09:11:36 bde Exp $ */ /* @@ -37,8 +37,8 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/cons.h> -#include <machine/cons.h> #include <machine/stdarg.h> #include <ddb/ddb.h> diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c index bddfbed..8060322 100644 --- a/sys/ddb/db_ps.c +++ b/sys/ddb/db_ps.c @@ -30,13 +30,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: db_ps.c,v 1.17 1999/01/27 19:00:49 dillon Exp $ + * $Id: db_ps.c,v 1.18 1999/05/13 13:01:46 bde Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> - -#include <machine/cons.h> +#include <sys/cons.h> #include <ddb/ddb.h> |