projects
/
platform
/
upstream
/
syslinux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dcd83b8
)
lwip: fix conflict with <netinet/in.h>
author
H. Peter Anvin
<hpa@zytor.com>
Thu, 10 Sep 2009 20:23:46 +0000
(13:23 -0700)
committer
Eric W. Biederman
<ebiederm@xmission.com>
Tue, 12 Apr 2011 21:40:51 +0000
(14:40 -0700)
Fix a conflict with <netinet/in.h>.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
core/lwip/src/include/ipv4/lwip/inet.h
patch
|
blob
|
history
diff --git
a/core/lwip/src/include/ipv4/lwip/inet.h
b/core/lwip/src/include/ipv4/lwip/inet.h
index
6f30d0d
..
7e80130
100644
(file)
--- 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 */