diff options
| author | jonas <[email protected]> | 2021-09-02 10:36:07 +0800 |
|---|---|---|
| committer | jonas <[email protected]> | 2021-09-02 10:36:07 +0800 |
| commit | d72ee7b6cc19e3b0d5721b2b5fa047ed1a5fc7c4 (patch) | |
| tree | ab7034a4df4cb5171a68c2236f9f831c8cd27ed0 /include | |
| parent | ab43390fe2c0e672771b73cf610e739a419aa06f (diff) | |
| parent | 8d175ab3d237dccc25450a8e12808fc87318eb2f (diff) | |
Merge branch 'master' of [email protected]:RT-Thread/rt-thread.git into bsp_hk32
# Conflicts:
# .ignore_format.yml
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc/libc_dirent.h | 17 | ||||
| -rw-r--r-- | include/rtdef.h | 1 | ||||
| -rw-r--r-- | include/rtlibc.h | 1 | ||||
| -rw-r--r-- | include/rtthread.h | 2 |
4 files changed, 1 insertions, 20 deletions
diff --git a/include/libc/libc_dirent.h b/include/libc/libc_dirent.h deleted file mode 100644 index a86332e633..0000000000 --- a/include/libc/libc_dirent.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2006-2021, RT-Thread Development Team - * - * SPDX-License-Identifier: Apache-2.0 - * - * Change Logs: - * Date Author Notes - */ - -#ifndef LIBC_DIRENT_H__ -#define LIBC_DIRENT_H__ - -#define DT_UNKNOWN 0x00 -#define DT_REG 0x01 -#define DT_DIR 0x02 - -#endif diff --git a/include/rtdef.h b/include/rtdef.h index 278676bcef..c0fcb8fce1 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -277,7 +277,6 @@ typedef int (*init_fn_t)(void); /* define these to empty, even if not include finsh.h file */ #define FINSH_FUNCTION_EXPORT(name, desc) #define FINSH_FUNCTION_EXPORT_ALIAS(name, alias, desc) -#define FINSH_VAR_EXPORT(name, type, desc) #define MSH_CMD_EXPORT(command, desc) #define MSH_CMD_EXPORT_ALIAS(command, alias, desc) diff --git a/include/rtlibc.h b/include/rtlibc.h index 4b145b1b1b..b59a29dadb 100644 --- a/include/rtlibc.h +++ b/include/rtlibc.h @@ -14,7 +14,6 @@ /* definitions for libc if toolchain has no these definitions */ #include "libc/libc_stat.h" #include "libc/libc_fcntl.h" -#include "libc/libc_dirent.h" #ifndef RT_USING_LIBC #if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__) diff --git a/include/rtthread.h b/include/rtthread.h index cf47a48efe..5e02af3f9e 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -585,7 +585,7 @@ void rt_assert_handler(const char *ex, const char *func, rt_size_t line); #endif /* RT_DEBUG */ #ifdef RT_USING_FINSH -#include <finsh_api.h> +#include <finsh.h> #endif /**@}*/ |