summaryrefslogtreecommitdiff
path: root/bsp
diff options
context:
space:
mode:
author[email protected] <[email protected]>2012-11-19 03:38:30 +0000
committer[email protected] <[email protected]>2012-11-19 03:38:30 +0000
commitc9e327d9c41a44dec21d5e2930cf0c212946972a (patch)
treedd3d13a2b370c5be0cf6132c31c7ab59f2819ab1 /bsp
parent20a57ea77c270fd7b48b39cef1052b719e0e97ee (diff)
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
Diffstat (limited to 'bsp')
-rw-r--r--bsp/simulator/applications/application.c4
-rw-r--r--bsp/simulator/rtconfig.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/bsp/simulator/applications/application.c b/bsp/simulator/applications/application.c
index cf84a1e116..a6c9739830 100644
--- a/bsp/simulator/applications/application.c
+++ b/bsp/simulator/applications/application.c
@@ -16,7 +16,11 @@
#include <stdio.h>
#include <board.h>
+/* fix the compile errors for redefiniton of lwip_htonl in win socket */
+#ifdef _WIN32
+#undef RT_USING_LWIP
#include <components.h>
+#endif
void rt_init_thread_entry(void* parameter)
{
diff --git a/bsp/simulator/rtconfig.h b/bsp/simulator/rtconfig.h
index 555da3cf18..f12a644528 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*/