Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1MMABC-0002kh-2E for mharc-grub-devel@gnu.org; Wed, 01 Jul 2009 20:29:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MMAB9-0002ej-FK for grub-devel@gnu.org; Wed, 01 Jul 2009 20:29:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MMAB4-0002QD-HY for grub-devel@gnu.org; Wed, 01 Jul 2009 20:29:30 -0400 Received: from [199.232.76.173] (port=42120 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MMAB4-0002Q2-EA for grub-devel@gnu.org; Wed, 01 Jul 2009 20:29:26 -0400 Received: from c60.cesmail.net ([216.154.195.49]:47755) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1MMAB3-0000Oi-NU for grub-devel@gnu.org; Wed, 01 Jul 2009 20:29:26 -0400 Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112]) by c60.cesmail.net with ESMTP; 01 Jul 2009 20:29:23 -0400 Received: from mj.roinet.com (static-72-92-88-10.phlapa.fios.verizon.net [72.92.88.10]) by smtprelay2.cesmail.net (Postfix) with ESMTPSA id 1FC3334C6D for ; Wed, 1 Jul 2009 20:36:54 -0400 (EDT) From: Pavel Roskin To: grub-devel@gnu.org Date: Wed, 01 Jul 2009 20:29:22 -0400 Message-ID: <20090702002922.8370.4238.stgit@mj.roinet.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] Fix warning in grub-emu compilation for i386-coreboot X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2009 00:29:31 -0000 Add include/grub/util/console.h, which matches utils/console.c and always declares grub_console_init() and grub_console_fini(), unlike the machine specific headers. ChangeLog: * include/grub/util/console.h: New file. * util/console.c: Use it. * util/grub-emu.c: Likewise. --- include/grub/util/console.h | 28 ++++++++++++++++++++++++++++ util/console.c | 2 +- util/grub-emu.c | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 include/grub/util/console.h diff --git a/include/grub/util/console.h b/include/grub/util/console.h new file mode 100644 index 0000000..1e55682 --- /dev/null +++ b/include/grub/util/console.h @@ -0,0 +1,28 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#ifndef GRUB_CONSOLE_UTIL_HEADER +#define GRUB_CONSOLE_UTIL_HEADER 1 + +/* Initialize the console system. */ +void grub_console_init (void); + +/* Finish the console system. */ +void grub_console_fini (void); + +#endif /* ! GRUB_CONSOLE_UTIL_HEADER */ diff --git a/util/console.c b/util/console.c index 04bb56d..9d8bb1a 100644 --- a/util/console.c +++ b/util/console.c @@ -35,7 +35,7 @@ # define A_STANDOUT 0 #endif /* ! A_STANDOUT */ -#include +#include #include #include diff --git a/util/grub-emu.c b/util/grub-emu.c index 31365f3..664a0b1 100644 --- a/util/grub-emu.c +++ b/util/grub-emu.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include