* include/grub/efi/api.h: Rename protocol and interface to avoid

	conflict.

diff --git a/ChangeLog b/ChangeLog
index e3d7814fb45ba69482027ac0aebb3674e02710a5..bdfe6394cd653a8811568fff5ffb39deb43538ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/efi/api.h: Rename protocol and interface to avoid
+       conflict.
+
 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * .gitignore: Add .exe variants. Add missing files. Remove few outdated

diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 4ba185cc6808b1e0a5e083f4e2642f0738ab469a..19a57d55382e9f571841131515a7e8a5c92e338c 100644 (file)
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -558,7 +558,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
                grub_memcpy (&usb, dp, len);
                grub_printf ("/USB(%x,%x)",
                             (unsigned) usb.parent_port_number,
-                            (unsigned) usb.interface);
+                            (unsigned) usb.usb_interface);
              }
              break;
            case GRUB_EFI_USB_CLASS_DEVICE_PATH_SUBTYPE:

diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index d6d3ec7459751f9e98623f9a8acf12239d450f8c..623ef14f93c65101a6bec05adcd631f2f446e757 100644 (file)
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -716,7 +716,7 @@ struct grub_efi_usb_device_path
 {
   grub_efi_device_path_t header;
   grub_efi_uint8_t parent_port_number;
-  grub_efi_uint8_t interface;
+  grub_efi_uint8_t usb_interface;
 } __attribute__ ((packed));
 typedef struct grub_efi_usb_device_path grub_efi_usb_device_path_t;
 
@@ -1023,8 +1023,8 @@ struct grub_efi_boot_services
    grub_efi_status_t
    (*install_protocol_interface) (grub_efi_handle_t *handle,
                                  grub_efi_guid_t *protocol,
-                                 grub_efi_interface_type_t interface_type,
-                                 void *interface);
+                                 grub_efi_interface_type_t protocol_interface_type,
+                                 void *protocol_interface);
 
   grub_efi_status_t
   (*reinstall_protocol_interface) (grub_efi_handle_t handle,
@@ -1035,12 +1035,12 @@ struct grub_efi_boot_services
   grub_efi_status_t
   (*uninstall_protocol_interface) (grub_efi_handle_t handle,
                                   grub_efi_guid_t *protocol,
-                                  void *interface);
+                                  void *protocol_interface);
 
   grub_efi_status_t
   (*handle_protocol) (grub_efi_handle_t handle,
                      grub_efi_guid_t *protocol,
-                     void **interface);
+                     void **protocol_interface);
 
   void *reserved;
 
@@ -1116,7 +1116,7 @@ struct grub_efi_boot_services
   grub_efi_status_t
   (*open_protocol) (grub_efi_handle_t handle,
                    grub_efi_guid_t *protocol,
-                   void **interface,
+                   void **protocol_interface,
                    grub_efi_handle_t agent_handle,
                    grub_efi_handle_t controller_handle,
                    grub_efi_uint32_t attributes);
@@ -1148,7 +1148,7 @@ struct grub_efi_boot_services
   grub_efi_status_t
   (*locate_protocol) (grub_efi_guid_t *protocol,
                      void *registration,
-                     void **interface);
+                     void **protocol_interface);
 
   grub_efi_status_t
   (*install_multiple_protocol_interfaces) (grub_efi_handle_t *handle, ...);