diff options
| author | guo <[email protected]> | 2021-10-14 12:00:15 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-14 12:00:15 +0800 |
| commit | 78db48ba78a1cc3f85f26b31f084887cd9698ee3 (patch) | |
| tree | 72d517895678e6c7d98204d2164d288d48b5841f /components/libc/compilers/dlib | |
| parent | 9aeb8e7fb4a175c9d2034fce4ce013588f6223d2 (diff) | |
| parent | a354f846e8699fbb8152cfa721f5b9a1e3a2c1a4 (diff) | |
Merge pull request #5169 from mysterywolf/libc
[libc]&[dfs] remove unnecessary RT_USING_POSIX and RT_USING_DFS_DEVFS
Diffstat (limited to 'components/libc/compilers/dlib')
| -rw-r--r-- | components/libc/compilers/dlib/libc.c | 10 | ||||
| -rw-r--r-- | components/libc/compilers/dlib/syscall_write.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/components/libc/compilers/dlib/libc.c b/components/libc/compilers/dlib/libc.c index f540ac955f..ac3d78f1f9 100644 --- a/components/libc/compilers/dlib/libc.c +++ b/components/libc/compilers/dlib/libc.c @@ -17,23 +17,23 @@ int libc_system_init(void) { -#if defined(RT_USING_DFS) && defined(RT_USING_DFS_DEVFS) +#ifdef RT_USING_DFS_DEVFS rt_device_t dev_console; dev_console = rt_console_get_device(); if (dev_console) { - #if defined(RT_USING_POSIX) + #ifdef RT_USING_POSIX libc_stdio_set_console(dev_console->parent.name, O_RDWR); #else libc_stdio_set_console(dev_console->parent.name, O_WRONLY); - #endif + #endif /* RT_USING_POSIX */ } -#endif +#endif /* RT_USING_DFS_DEVFS */ #if defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) pthread_system_init(); -#endif +#endif /* defined (RT_USING_PTHREADS) && !defined (RT_USING_COMPONENTS_INIT) */ return 0; } diff --git a/components/libc/compilers/dlib/syscall_write.c b/components/libc/compilers/dlib/syscall_write.c index ffee51882d..481e9f8c3d 100644 --- a/components/libc/compilers/dlib/syscall_write.c +++ b/components/libc/compilers/dlib/syscall_write.c @@ -25,7 +25,7 @@ size_t __write(int handle, const unsigned char *buf, size_t len) { #ifdef RT_USING_DFS int size; -#endif +#endif /* RT_USING_DFS */ if ((handle == _LLIO_STDOUT) || (handle == _LLIO_STDERR)) { @@ -33,7 +33,7 @@ size_t __write(int handle, const unsigned char *buf, size_t len) return _LLIO_ERROR; #else -#ifdef RT_USING_POSIX +#ifdef RT_USING_DFS if (libc_stdio_get_console() < 0) { LOG_W("Do not invoke standard output before initializing libc"); @@ -50,8 +50,8 @@ size_t __write(int handle, const unsigned char *buf, size_t len) } return len; -#endif -#endif +#endif /* RT_USING_DFS */ +#endif /* RT_USING_CONSOLE */ } else if (handle == _LLIO_STDIN) { @@ -63,6 +63,6 @@ size_t __write(int handle, const unsigned char *buf, size_t len) #else size = write(handle, buf, len); return size; -#endif +#endif /* RT_USING_DFS */ } |