diff options
| author | Michael Brown | 2012-03-26 15:43:52 +0200 |
|---|---|---|
| committer | Michael Brown | 2012-03-26 15:43:52 +0200 |
| commit | a6d49c17c9ef82420138a51b52a9ce57074650db (patch) | |
| tree | 1931f96976c9a733b8f07d1ae0269d84ac0f113c /src/include | |
| parent | [image] Add the "imgtrust" and "imgverify" commands (diff) | |
| download | ipxe-a6d49c17c9ef82420138a51b52a9ce57074650db.tar.gz ipxe-a6d49c17c9ef82420138a51b52a9ce57074650db.tar.xz ipxe-a6d49c17c9ef82420138a51b52a9ce57074650db.zip | |
[console] Move putchar() and getchar() declarations to stdio.h
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/etherboot.h | 1 | ||||
| -rw-r--r-- | src/include/ipxe/console.h | 3 | ||||
| -rw-r--r-- | src/include/stdio.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/include/etherboot.h b/src/include/etherboot.h index b2fbe4f67..ba79cb16a 100644 --- a/src/include/etherboot.h +++ b/src/include/etherboot.h @@ -14,7 +14,6 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdio.h> #include <unistd.h> #include <strings.h> -#include <ipxe/console.h> #include <ipxe/timer.h> #include <ipxe/if_arp.h> #include <ipxe/if_ether.h> diff --git a/src/include/ipxe/console.h b/src/include/ipxe/console.h index 3bfa5033f..5188f9855 100644 --- a/src/include/ipxe/console.h +++ b/src/include/ipxe/console.h @@ -1,6 +1,7 @@ #ifndef _IPXE_CONSOLE_H #define _IPXE_CONSOLE_H +#include <stdio.h> #include <ipxe/tables.h> /** @file @@ -100,8 +101,6 @@ struct console_driver { /* Function prototypes */ -extern void putchar ( int character ); -extern int getchar ( void ); extern int iskey ( void ); extern int getkey ( unsigned long timeout ); diff --git a/src/include/stdio.h b/src/include/stdio.h index 84181f0a1..91840af5b 100644 --- a/src/include/stdio.h +++ b/src/include/stdio.h @@ -6,6 +6,10 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <stdint.h> #include <stdarg.h> +extern void putchar ( int character ); + +extern int getchar ( void ); + extern int __attribute__ (( format ( printf, 1, 2 ) )) printf ( const char *fmt, ... ); |