Merge pull request #872 from ArdaFu/master
[components][net] In SConscript file, replace RT_USING_LWIP140 with RT_USING_LWIP141
This commit is contained in:
commit
f47898bb17
|
@ -48,6 +48,7 @@
|
||||||
#include <posix_termios.h>
|
#include <posix_termios.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef RT_USING_DFS
|
||||||
#ifdef RT_USING_DFS_DEVFS
|
#ifdef RT_USING_DFS_DEVFS
|
||||||
#include <dfs_posix.h>
|
#include <dfs_posix.h>
|
||||||
|
|
||||||
|
@ -209,7 +210,7 @@ const static struct dfs_file_ops _serial_fops =
|
||||||
serial_fops_poll,
|
serial_fops_poll,
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
/*
|
/*
|
||||||
* Serial poll routines
|
* Serial poll routines
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -23,8 +23,10 @@
|
||||||
*/
|
*/
|
||||||
#include <rthw.h>
|
#include <rthw.h>
|
||||||
#include <rtdevice.h>
|
#include <rtdevice.h>
|
||||||
|
#if defined(RT_USING_DFS)
|
||||||
#include <dfs_file.h>
|
#include <dfs_file.h>
|
||||||
#include <dfs_posix.h>
|
#include <dfs_posix.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS)
|
#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS)
|
||||||
static int pipe_open(struct dfs_fd *fd)
|
static int pipe_open(struct dfs_fd *fd)
|
||||||
|
|
|
@ -7,8 +7,8 @@ objs = []
|
||||||
cwd = GetCurrentDir()
|
cwd = GetCurrentDir()
|
||||||
list = os.listdir(cwd)
|
list = os.listdir(cwd)
|
||||||
|
|
||||||
# the default version of LWIP is 1.4.1
|
# the default version of LWIP is 2.0.2
|
||||||
if not GetDepend('RT_USING_LWIP132') and not GetDepend('RT_USING_LWIP140') and not GetDepend('RT_USING_LWIP202'):
|
if not GetDepend('RT_USING_LWIP132') and not GetDepend('RT_USING_LWIP141') and not GetDepend('RT_USING_LWIP202'):
|
||||||
AddDepend('RT_USING_LWIP202')
|
AddDepend('RT_USING_LWIP202')
|
||||||
|
|
||||||
for d in list:
|
for d in list:
|
||||||
|
|
Loading…
Reference in New Issue