diff options
| author | bernard <[email protected]> | 2017-10-25 07:25:39 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2017-10-25 07:25:39 +0800 |
| commit | d9592457fb9d3ac6c463b775a666d8bf298184f0 (patch) | |
| tree | ed83d68dd5c4607c152dff7ed800c0958bbe2dfd /components | |
| parent | 0d45288f066d1ef4e5d94fb2d38d5864d3145c48 (diff) | |
| parent | 526e021525c628bd0b1a54f5bf5bea2a7fcabcde (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components')
| -rw-r--r-- | components/dfs/src/dfs.c | 2 | ||||
| -rw-r--r-- | components/libc/compilers/minilibc/SConscript | 2 | ||||
| -rw-r--r-- | components/net/lwip_dhcpd/SConscript | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index e5a8aa549d..c83aad3e2d 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -128,7 +128,7 @@ int fd_new(void) /* can't find an empty fd entry */ if (idx == DFS_FD_MAX) { - idx = -1; + idx = -(1 + DFS_FD_OFFSET); goto __result; } diff --git a/components/libc/compilers/minilibc/SConscript b/components/libc/compilers/minilibc/SConscript index da68881349..518d800571 100644 --- a/components/libc/compilers/minilibc/SConscript +++ b/components/libc/compilers/minilibc/SConscript @@ -8,7 +8,7 @@ group = [] CPPPATH = [cwd] CPPDEFINES = ['RT_USING_MINILIBC'] -if rtconfig.PLATFORM == 'gcc' and not GetDepend('RT_USING_LIBC'): +if rtconfig.PLATFORM == 'gcc' and rtconfig.ARCH != 'sim' and not GetDepend('RT_USING_LIBC'): group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/components/net/lwip_dhcpd/SConscript b/components/net/lwip_dhcpd/SConscript index d5704c8c8b..7e9e365454 100644 --- a/components/net/lwip_dhcpd/SConscript +++ b/components/net/lwip_dhcpd/SConscript @@ -5,6 +5,6 @@ src = Glob('*.c') CPPPATH = [cwd] -group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_DHCPD'], CPPPATH = CPPPATH) +group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'LWIP_USING_DHCPD'], CPPPATH = CPPPATH) Return('group') |