Browse Source

fix compiling issue when enable newlib.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1933 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong@gmail.com 13 years ago
parent
commit
d4ebec7cce
1 changed files with 12 additions and 6 deletions
  1. 12 6
      components/net/lwip/src/lwipopts.h

+ 12 - 6
components/net/lwip/src/lwipopts.h

@@ -33,7 +33,7 @@
 #define LWIP_DNS					0
 #define LWIP_DNS					0
 #endif
 #endif
 
 
-#define LWIP_HAVE_LOOPIF            1
+#define LWIP_HAVE_LOOPIF            0
 
 
 #define LWIP_PLATFORM_BYTESWAP      0
 #define LWIP_PLATFORM_BYTESWAP      0
 #define BYTE_ORDER                  LITTLE_ENDIAN
 #define BYTE_ORDER                  LITTLE_ENDIAN
@@ -41,6 +41,12 @@
 /* Enable SO_RCVTIMEO processing.   */
 /* Enable SO_RCVTIMEO processing.   */
 #define LWIP_SO_RCVTIMEO 			1
 #define LWIP_SO_RCVTIMEO 			1
 
 
+#ifdef RT_USING_NEWLIB
+/* use timeval structure in newlib */
+#define LWIP_TIMEVAL_PRIVATE 0
+#include <sys/time.h>
+#endif
+
 /* #define RT_LWIP_DEBUG */
 /* #define RT_LWIP_DEBUG */
 
 
 #ifdef RT_LWIP_DEBUG
 #ifdef RT_LWIP_DEBUG
@@ -110,7 +116,7 @@
 #define MEMP_NUM_UDP_PCB            RT_LWIP_UDP_PCB_NUM
 #define MEMP_NUM_UDP_PCB            RT_LWIP_UDP_PCB_NUM
 #endif
 #endif
 
 
-/* the number of simulatenously active TCP connections. */
+/* the number of simultaneously active TCP connections. */
 #ifdef RT_LWIP_TCP_PCB_NUM
 #ifdef RT_LWIP_TCP_PCB_NUM
 #define MEMP_NUM_TCP_PCB            RT_LWIP_TCP_PCB_NUM
 #define MEMP_NUM_TCP_PCB            RT_LWIP_TCP_PCB_NUM
 #endif
 #endif
@@ -122,7 +128,7 @@
 #define MEMP_NUM_TCP_SEG            TCP_SND_QUEUELEN
 #define MEMP_NUM_TCP_SEG            TCP_SND_QUEUELEN
 #endif
 #endif
 
 
-/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
+/* MEMP_NUM_SYS_TIMEOUT: the number of simultaneously active
    timeouts. */
    timeouts. */
 #define MEMP_NUM_SYS_TIMEOUT        8
 #define MEMP_NUM_SYS_TIMEOUT        8
 
 
@@ -235,10 +241,10 @@
 
 
 /* IP reassembly and segmentation.These are orthogonal even
 /* IP reassembly and segmentation.These are orthogonal even
  * if they both deal with IP fragments */
  * if they both deal with IP fragments */
-#define IP_REASSEMBLY               1
+#define IP_REASSEMBLY               0
 #define IP_REASS_MAX_PBUFS          10
 #define IP_REASS_MAX_PBUFS          10
 #define MEMP_NUM_REASSDATA          10
 #define MEMP_NUM_REASSDATA          10
-#define IP_FRAG                     1
+#define IP_FRAG                     0
 
 
 /* ---------- ICMP options ---------- */
 /* ---------- ICMP options ---------- */
 #define ICMP_TTL                    255
 #define ICMP_TTL                    255
@@ -267,7 +273,7 @@
 #define LWIP_UDP                    0
 #define LWIP_UDP                    0
 #endif
 #endif
 
 
-#define LWIP_UDPLITE                1
+#define LWIP_UDPLITE                0
 #define UDP_TTL                     255
 #define UDP_TTL                     255
 #define DEFAULT_UDP_RECVMBOX_SIZE   1
 #define DEFAULT_UDP_RECVMBOX_SIZE   1