[PATCH] kern/emu/misc.c: Don't include config-util.h when running as GRUB_BUILD

[PATCH] kern/emu/misc.c: Don't include config-util.h when running as GRUB_BUILD

[Vladimir 'phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 42 bytes --]

-- 
Regards
Vladimir 'phcoder' Serbinenko

[-- Attachment #2: 0003-kern-emu-misc.c-Don-t-include-config-util.h-when-run.patch --]
[-- Type: application/octet-stream, Size: 688 bytes --]

From 0874ae0fb735dfd5c36093ddf363955275c4d0c7 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Mar 2019 17:19:38 +0100
Subject: [PATCH 3/3] kern/emu/misc.c: Don't include config-util.h when running
 as GRUB_BUILD

---
 grub-core/kern/emu/misc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index 76661337f..65db79baa 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -16,7 +16,9 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef GRUB_BUILD
 #include <config-util.h>
+#endif
 #include <config.h>
 
 #include <errno.h>
-- 
2.11.0

Re: [PATCH] kern/emu/misc.c: Don't include config-util.h when running as GRUB_BUILD

[Colin Watson]

Ah, this explains some strangeness I was seeing.  Thanks.

Reviewed-by: Colin Watson <cjwatson@ubuntu.com>

-- 
Colin Watson                                       [cjwatson@ubuntu.com]

Re: [PATCH] kern/emu/misc.c: Don't include config-util.h when running as GRUB_BUILD

[Daniel Kiper]

On Fri, Mar 22, 2019 at 11:54:45PM +0000, Colin Watson wrote:
> Ah, this explains some strangeness I was seeing.  Thanks.
>
> Reviewed-by: Colin Watson <cjwatson@ubuntu.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel