[2366] 2009-06-27 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2366
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2366
Author:   proski
Date:     2009-06-27 06:10:33 +0000 (Sat, 27 Jun 2009)
Log Message:
-----------
2009-06-27  Pavel Roskin  <address@hidden>

        * efiemu/prepare.c: Eliminate TYPE macro, it makes code hard to
        read.
        * efiemu/prepare32.c: Likewise.
        * efiemu/prepare64.c: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/efiemu/prepare.c
    trunk/grub2/efiemu/prepare32.c
    trunk/grub2/efiemu/prepare64.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-27 03:01:42 UTC (rev 2365)
+++ trunk/grub2/ChangeLog       2009-06-27 06:10:33 UTC (rev 2366)
@@ -1,3 +1,10 @@
+2009-06-27  Pavel Roskin  <address@hidden>
+
+       * 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  <address@hidden>
 
        * include/grub/types.h: Define GRUB_TARGET_WORDSIZE.

Modified: trunk/grub2/efiemu/prepare.c
===================================================================
--- trunk/grub2/efiemu/prepare.c        2009-06-27 03:01:42 UTC (rev 2365)
+++ trunk/grub2/efiemu/prepare.c        2009-06-27 06:10:33 UTC (rev 2366)
@@ -35,8 +35,8 @@
   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_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_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++)

Modified: trunk/grub2/efiemu/prepare32.c
===================================================================
--- trunk/grub2/efiemu/prepare32.c      2009-06-27 03:01:42 UTC (rev 2365)
+++ trunk/grub2/efiemu/prepare32.c      2009-06-27 06:10:33 UTC (rev 2366)
@@ -18,6 +18,5 @@
  */
 
 #define SUFFIX(x) x ## 32
-#define TYPE(x) x ## 32_t
 
 #include "prepare.c"

Modified: trunk/grub2/efiemu/prepare64.c
===================================================================
--- trunk/grub2/efiemu/prepare64.c      2009-06-27 03:01:42 UTC (rev 2365)
+++ trunk/grub2/efiemu/prepare64.c      2009-06-27 06:10:33 UTC (rev 2366)
@@ -18,6 +18,5 @@
  */
 
 #define SUFFIX(x) x ## 64
-#define TYPE(x) x ## 64_t
 
 #include "prepare.c"