From 19554a6034edfc333143fd7dc4842429a64bbd2d Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Sat, 2 Jan 2016 19:02:19 +0300
Subject: [PATCH] acpihalt: fix GRUB_DSDT_TEST compilation

---
 grub-core/commands/acpihalt.c | 2 ++
 include/grub/acpi.h           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
index da68b5b52..412a9c9ac 100644
--- a/grub-core/commands/acpihalt.c
+++ b/grub-core/commands/acpihalt.c
@@ -26,6 +26,8 @@
 
 #define grub_dprintf(cond, args...) printf ( args )
 #define grub_printf printf
+#define grub_util_fopen fopen
+#define grub_memcmp memcmp
 typedef uint64_t grub_uint64_t;
 typedef uint32_t grub_uint32_t;
 typedef uint16_t grub_uint16_t;
diff --git a/include/grub/acpi.h b/include/grub/acpi.h
index 8a8110241..10bfbd2cd 100644
--- a/include/grub/acpi.h
+++ b/include/grub/acpi.h
@@ -22,6 +22,8 @@
 #ifndef GRUB_DSDT_TEST
 #include <grub/types.h>
 #include <grub/err.h>
+#else
+#define GRUB_PACKED __attribute__ ((packed))
 #endif
 
 #define GRUB_RSDP_SIGNATURE "RSD PTR "