From c9e327d9c41a44dec21d5e2930cf0c212946972a Mon Sep 17 00:00:00 2001 From: "goprife@gmail.com" Date: Mon, 19 Nov 2012 03:38:30 +0000 Subject: [PATCH] fix the compile error(htos redefinition) in application.c when enable LWIP disable LWIP by default git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2427 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- bsp/simulator/applications/application.c | 4 ++++ bsp/simulator/rtconfig.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bsp/simulator/applications/application.c b/bsp/simulator/applications/application.c index cf84a1e11..a6c973983 100644 --- a/bsp/simulator/applications/application.c +++ b/bsp/simulator/applications/application.c @@ -16,7 +16,11 @@ #include #include +/* fix the compile errors for redefiniton of lwip_htonl in win socket */ +#ifdef _WIN32 +#undef RT_USING_LWIP #include +#endif void rt_init_thread_entry(void* parameter) { diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h index 555da3cf1..f12a64452 100644 --- a/bsp/simulator/rtconfig.h +++ b/bsp/simulator/rtconfig.h @@ -109,7 +109,7 @@ #define DFS_FD_MAX 4 /* SECTION: lwip, a lighwight TCP/IP protocol stack */ -#define RT_USING_LWIP +//#define RT_USING_LWIP /* LwIP uses RT-Thread Memory Management */ #define RT_LWIP_USING_RT_MEM /* Enable ICMP protocol*/