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.

diff --git a/ChangeLog b/ChangeLog
index 6596c16d27b41f49ea5a77f0e4ffd511339eabb3..0cab9cd94da10007042c361ba219e576b6756307 100644 (file)
--- 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 048893317470c3ec03bd9ef05d4488dd24078efc..e1dc4180d90b0c18a9dfffb72f2984a45a1fada7 100644 (file)
--- 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 48c177f98aac9258a0432393bc2779d9b67baae8..fd6109ea39c2b415116cc617d081c6b51db4fb8e 100644 (file)
--- 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 f1399bdfb0714389c277682705cc56f0e673c7cf..811f558967f91e25432b60a3f6d943058cfdefac 100644 (file)
--- 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"