summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2008-07-15 23:02:13 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:27:15 +0200
commita2157edfb4675c418158591f3cb8664e043ed5a0 (patch)
tree5e093ff30d2ef7586750fe86fc48ddc79dd5d135 /kern
parent55fa0d11a027481b1e0e0a8a78c65393e4cbb290 (diff)
2008-07-15 Barry deFreese <bddebian@comcast.net>
* device/cons.c (cnputc): Turn parameter `c' into a char. * device/cons.h (cninit, cngetc, cnmaygetc, cnputc): Add prototypes. * i386/i386at/model_dep.c: Include <device/cons.h> * kern/printf.c: Include <device/cons.h> (cnputc): Remove prototype. (vprintf, iprintf): Explicitely cast cnputc into the type _doprnt expects. * linux/dev/kernel/printk.c: Include <device/cons.h> (cnputc): Remove prototype.
Diffstat (limited to 'kern')
-rw-r--r--kern/printf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kern/printf.c b/kern/printf.c
index 99dffbd..88a527b 100644
--- a/kern/printf.c
+++ b/kern/printf.c
@@ -114,6 +114,7 @@
*/
#include <string.h>
+#include <device/cons.h>
#include <kern/printf.h>
#include <mach/boolean.h>
#include <kern/lock.h>
@@ -510,11 +511,10 @@ void _doprnt(
/*
* Printing (to console)
*/
-extern void cnputc( char, /*not really*/vm_offset_t);
int vprintf(const char *fmt, va_list listp)
{
- _doprnt(fmt, &listp, cnputc, 16, 0);
+ _doprnt(fmt, &listp, (void (*)( char, vm_offset_t)) cnputc, 16, 0);
return 0;
}
@@ -550,7 +550,7 @@ void iprintf(const char *fmt, ...)
}
}
va_start(listp, fmt);
- _doprnt(fmt, &listp, cnputc, 16, 0);
+ _doprnt(fmt, &listp, (void (*)( char, vm_offset_t)) cnputc, 16, 0);
va_end(listp);
}