* include/grub/net.h: Remove double declarations.

diff --git a/ChangeLog b/ChangeLog
index c174a8a3fd37ed02b65e6e0099719920247a0efc..8e29e8e7960e393beb0036f1ed72440d6043dcd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/net.h: Remove double declarations.
+
 2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Remove "payload" command in ia64 Linux loader since I couldn't

diff --git a/include/grub/net.h b/include/grub/net.h
index d9fd821d949de88b5a293a9e92be12e33a99bc6a..7d6f06733606ff52674025fe3de028911579e93c 100644 (file)
--- 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);