diff options
| author | Bernard Xiong <[email protected]> | 2017-10-16 16:42:12 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-16 16:42:12 +0800 |
| commit | f47898bb17e9542d56fd0cbdf8e917d2b28d69fd (patch) | |
| tree | b1f3d7ee18c07879e921fbbc318e889a3eced873 | |
| parent | 296d57e859942e6bf3d21b8987cebc09ae1ffc98 (diff) | |
| parent | fc7abc658013d326d47145f85402cead0728b1a0 (diff) | |
Merge pull request #872 from ArdaFu/master
[components][net] In SConscript file, replace RT_USING_LWIP140 with RT_USING_LWIP141
| -rw-r--r-- | components/drivers/serial/serial.c | 3 | ||||
| -rw-r--r-- | components/drivers/src/pipe.c | 2 | ||||
| -rw-r--r-- | components/net/SConscript | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index 48b60caeaf..c279490dec 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -48,6 +48,7 @@ #include <posix_termios.h> #endif +#ifdef RT_USING_DFS #ifdef RT_USING_DFS_DEVFS #include <dfs_posix.h> @@ -209,7 +210,7 @@ const static struct dfs_file_ops _serial_fops = serial_fops_poll, }; #endif - +#endif /* * Serial poll routines */ diff --git a/components/drivers/src/pipe.c b/components/drivers/src/pipe.c index b455870c8a..bc9ed5f9a2 100644 --- a/components/drivers/src/pipe.c +++ b/components/drivers/src/pipe.c @@ -23,8 +23,10 @@ */ #include <rthw.h> #include <rtdevice.h> +#if defined(RT_USING_DFS) #include <dfs_file.h> #include <dfs_posix.h> +#endif #if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS) static int pipe_open(struct dfs_fd *fd) diff --git a/components/net/SConscript b/components/net/SConscript index bfb1cb9afd..b930821bd8 100644 --- a/components/net/SConscript +++ b/components/net/SConscript @@ -7,8 +7,8 @@ objs = [] cwd = GetCurrentDir() list = os.listdir(cwd) -# the default version of LWIP is 1.4.1 -if not GetDepend('RT_USING_LWIP132') and not GetDepend('RT_USING_LWIP140') and not GetDepend('RT_USING_LWIP202'): +# the default version of LWIP is 2.0.2 +if not GetDepend('RT_USING_LWIP132') and not GetDepend('RT_USING_LWIP141') and not GetDepend('RT_USING_LWIP202'): AddDepend('RT_USING_LWIP202') for d in list: |