From 97fe384ecb6cff06de5cd25e86a10ae886b2b76f Mon Sep 17 00:00:00 2001
From: proski <proski@localhost>
Date: Sat, 27 Jun 2009 06:10:33 +0000
Subject: [PATCH] 2009-06-27  Pavel Roskin  <proski@gnu.org>

	* efiemu/prepare.c: Eliminate TYPE macro, it makes code hard to
	read.
	* efiemu/prepare32.c: Likewise.
	* efiemu/prepare64.c: Likewise.
---
 ChangeLog          |  7 +++++++
 efiemu/prepare.c   | 10 +++++-----
 efiemu/prepare32.c |  1 -
 efiemu/prepare64.c |  1 -
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6596c16d2..0cab9cd94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-27  Pavel Roskin  <proski@gnu.org>
+
+	* efiemu/prepare.c: Eliminate TYPE macro, it makes code hard to
+	read.
+	* efiemu/prepare32.c: Likewise.
+	* efiemu/prepare64.c: Likewise.
+
 2009-06-26  Pavel Roskin  <proski@gnu.org>
 
 	* include/grub/types.h: Define GRUB_TARGET_WORDSIZE.
diff --git a/efiemu/prepare.c b/efiemu/prepare.c
index 048893317..e1dc4180d 100644
--- a/efiemu/prepare.c
+++ b/efiemu/prepare.c
@@ -35,8 +35,8 @@ SUFFIX (grub_efiemu_prepare) (struct grub_efiemu_prepare_hook *prepare_hooks,
   struct grub_efiemu_prepare_hook *curhook;
 
   int cntconftables = 0;
-  TYPE (grub_efiemu_configuration_table) *conftables = 0;
-  TYPE (grub_efiemu_runtime_services) *runtime_services;
+  struct SUFFIX (grub_efiemu_configuration_table) *conftables = 0;
+  struct SUFFIX (grub_efiemu_runtime_services) *runtime_services;
   int i;
   int handle;
   grub_off_t off;
@@ -77,14 +77,14 @@ SUFFIX (grub_efiemu_prepare) (struct grub_efiemu_prepare_hook *prepare_hooks,
     }
 
   SUFFIX (grub_efiemu_system_table)
-    = (TYPE (grub_efi_system_table) *)
+    = (struct SUFFIX (grub_efi_system_table) *)
     ((grub_uint8_t *)grub_efiemu_mm_obtain_request (handle) + off);
 
   /* compute CRC32 of runtime_services */
   if ((err = grub_efiemu_resolve_symbol ("efiemu_runtime_services",
 					 &handle, &off)))
     return err;
-  runtime_services = (TYPE (grub_efiemu_runtime_services) *)
+  runtime_services = (struct SUFFIX (grub_efiemu_runtime_services) *)
 	((grub_uint8_t *)grub_efiemu_mm_obtain_request (handle) + off);
   runtime_services->hdr.crc32 = 0;
   runtime_services->hdr.crc32 = grub_getcrc32
@@ -98,7 +98,7 @@ SUFFIX (grub_efiemu_prepare) (struct grub_efiemu_prepare_hook *prepare_hooks,
   SUFFIX(grub_efiemu_system_table)->num_table_entries = cntconftables;
 
   /* Fill the list of configuration tables */
-  conftables = (TYPE (grub_efiemu_configuration_table) *)
+  conftables = (struct SUFFIX (grub_efiemu_configuration_table) *)
     grub_efiemu_mm_obtain_request (conftable_handle);
   i = 0;
   for (cur = config_tables; cur; cur = cur->next, i++)
diff --git a/efiemu/prepare32.c b/efiemu/prepare32.c
index 48c177f98..fd6109ea3 100644
--- a/efiemu/prepare32.c
+++ b/efiemu/prepare32.c
@@ -18,6 +18,5 @@
  */
 
 #define SUFFIX(x) x ## 32
-#define TYPE(x) x ## 32_t
 
 #include "prepare.c"
diff --git a/efiemu/prepare64.c b/efiemu/prepare64.c
index f1399bdfb..811f55896 100644
--- a/efiemu/prepare64.c
+++ b/efiemu/prepare64.c
@@ -18,6 +18,5 @@
  */
 
 #define SUFFIX(x) x ## 64
-#define TYPE(x) x ## 64_t
 
 #include "prepare.c"