merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-25 22:34:59 +02:00
commit 72d14db9ba
3 changed files with 21 additions and 4 deletions

View file

@ -55,7 +55,7 @@ static struct color colors[] =
};
static void
put (const int c)
put (struct grub_term_output *term __attribute__ ((unused)), const int c)
{
char chr = c;
@ -63,7 +63,7 @@ put (const int c)
}
static int
readkey (void)
readkey (struct grub_term_input *term __attribute__ ((unused)))
{
grub_uint8_t c;
grub_ssize_t actual = 0;