[syslinux:lwip] lwip: fix conflict with <netinet/in.h>
syslinux-bot for H. Peter Anvin
hpa at zytor.com
Fri Apr 22 20:05:31 PDT 2011
Commit-ID: 37e80c78a4328cda23de6e0383881d4a10895913
Gitweb: http://syslinux.zytor.com/commit/37e80c78a4328cda23de6e0383881d4a10895913
Author: H. Peter Anvin <hpa at zytor.com>
AuthorDate: Thu, 10 Sep 2009 13:23:46 -0700
Committer: Eric W. Biederman <ebiederm at xmission.com>
CommitDate: Tue, 12 Apr 2011 14:40:51 -0700
lwip: fix conflict with <netinet/in.h>
Fix a conflict with <netinet/in.h>.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
core/lwip/src/include/ipv4/lwip/inet.h | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/core/lwip/src/include/ipv4/lwip/inet.h b/core/lwip/src/include/ipv4/lwip/inet.h
index 6f30d0d..7e80130 100644
--- a/core/lwip/src/include/ipv4/lwip/inet.h
+++ b/core/lwip/src/include/ipv4/lwip/inet.h
@@ -39,9 +39,7 @@ extern "C" {
#endif
/* For compatibility with BSD code */
-struct in_addr {
- u32_t s_addr;
-};
+#include <netinet/in.h>
#define INADDR_NONE ((u32_t)0xffffffffUL) /* 255.255.255.255 */
#define INADDR_LOOPBACK ((u32_t)0x7f000001UL) /* 127.0.0.1 */
More information about the Syslinux-commits
mailing list