From 579d2ad81130e7546de6f555d49b685d9ee99d14 Mon Sep 17 00:00:00 2001
From: likewise <likewise>
Date: Thu, 11 Mar 2004 21:37:56 +0000
Subject: [PATCH] Disabling ip_addr_isbroadcast() due to recursive header
 dependencies. Currently, patch #2679 is broken, but will be neatly fixed once
 this is solved.

---
 src/core/ipv4/ip_addr.c         | 2 +-
 src/include/ipv4/lwip/ip_addr.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/ipv4/ip_addr.c b/src/core/ipv4/ip_addr.c
index 53618ed2..e2c674d4 100644
--- a/src/core/ipv4/ip_addr.c
+++ b/src/core/ipv4/ip_addr.c
@@ -41,7 +41,7 @@ const struct ip_addr ip_addr_broadcast = { 0xffffffffUL };
  * as it does not support non-broadcast interfaces.
  * lwip-devel 18-2-2004
  */
-#if 1 /* replaces macro in ip_addr.h */
+#if 0 /* going to replace macro in ip_addr.h */
 #include "lwip/netif.h"
 
 u8_t ip_addr_isbroadcast(struct ip_addr *addr, netif)
diff --git a/src/include/ipv4/lwip/ip_addr.h b/src/include/ipv4/lwip/ip_addr.h
index c24441ae..28d83b1a 100644
--- a/src/include/ipv4/lwip/ip_addr.h
+++ b/src/include/ipv4/lwip/ip_addr.h
@@ -111,13 +111,13 @@ extern const struct ip_addr ip_addr_broadcast;
 
 #define ip_addr_isany(addr1) ((addr1) == NULL || (addr1)->addr == 0)
 
-u8_t ip_addr_isbroadcast(struct ip_addr *addr, struct netif *netif);
-
-#if 0 /* replaced by function in ip_addr.c */
+#if 1 /* replaced by function in ip_addr.c */
 #define ip_addr_isbroadcast(addr1, mask) (((((addr1)->addr) & ~((mask)->addr)) == \
            (0xffffffff & ~((mask)->addr))) || \
                                          ((addr1)->addr == 0xffffffff) || \
                                          ((addr1)->addr == 0x00000000))
+#else
+u8_t ip_addr_isbroadcast(struct ip_addr *addr, struct netif *netif);
 #endif
 
 #define ip_addr_ismulticast(addr1) (((addr1)->addr & ntohl(0xf0000000)) == ntohl(0xe0000000))