From b2c0c4a6c62a978682a7d73d9f26e0e8b5df22f3 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 9 Feb 2012 22:44:28 +0100 Subject: [PATCH] * include/grub/net.h: Remove double declarations. --- ChangeLog | 4 ++++ include/grub/net.h | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c174a8a3f..8e29e8e79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-02-09 Vladimir Serbinenko + + * include/grub/net.h: Remove double declarations. + 2012-02-09 Vladimir Serbinenko Remove "payload" command in ia64 Linux loader since I couldn't diff --git a/include/grub/net.h b/include/grub/net.h index d9fd821d9..7d6f06733 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -306,6 +306,8 @@ grub_net_add_addr (const char *name, extern struct grub_net_network_level_interface *grub_net_network_level_interfaces; #define FOR_NET_NETWORK_LEVEL_INTERFACES(var) for (var = grub_net_network_level_interfaces; var; var = var->next) +#define FOR_NET_NETWORK_LEVEL_INTERFACES_SAFE(var,next) for (var = grub_net_network_level_interfaces, next = (var ? var->next : 0); var; var = next, next = (var ? var->next : 0)) + extern grub_net_app_level_t grub_net_app_level_list; @@ -451,11 +453,6 @@ grub_net_addr_to_str (const grub_net_network_level_address_t *target, void grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str); -extern struct grub_net_network_level_interface *grub_net_network_level_interfaces; -#define FOR_NET_NETWORK_LEVEL_INTERFACES(var) for (var = grub_net_network_level_interfaces; var; var = var->next) - -#define FOR_NET_NETWORK_LEVEL_INTERFACES_SAFE(var,next) for (var = grub_net_network_level_interfaces, next = (var ? var->next : 0); var; var = next, next = (var ? var->next : 0)) - void grub_net_poll_cards (unsigned time);