acpihalt: fix GRUB_DSDT_TEST compilation

diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
index da68b5b528ded1ae008c06b545c9568e2c20c5a8..412a9c9ac348870c49c97728a1ed938245b95abb 100644 (file)
--- 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 8a8110241d2044db2254d8e845e1b8273197ac3b..10bfbd2cd88c5c5af3e87ca093f2905b81e0e15b 100644 (file)
--- 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 "