diff options
| author | liukangcc <[email protected]> | 2021-09-17 15:03:14 +0800 |
|---|---|---|
| committer | liukangcc <[email protected]> | 2021-09-17 15:03:14 +0800 |
| commit | 4b3df6010f7870aebcd1df20bbaabd5fe9212c6d (patch) | |
| tree | 95b0e12447425f803be46d16eaf6e7188c364fec /components/dfs/src | |
| parent | f07507a91310bc5696a08f5bbf6ab8679cfbcf73 (diff) | |
| parent | ef71de34f76d4403fcd2cddd21a17f3a53a40296 (diff) | |
Merge remote-tracking branch 'remotes/rtt_github/master'
Diffstat (limited to 'components/dfs/src')
| -rw-r--r-- | components/dfs/src/dfs_poll.c (renamed from components/dfs/src/poll.c) | 2 | ||||
| -rw-r--r-- | components/dfs/src/dfs_posix.c | 12 | ||||
| -rw-r--r-- | components/dfs/src/dfs_select.c (renamed from components/dfs/src/select.c) | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/components/dfs/src/poll.c b/components/dfs/src/dfs_poll.c index d1e0372494..607b3487be 100644 --- a/components/dfs/src/poll.c +++ b/components/dfs/src/dfs_poll.c @@ -17,7 +17,7 @@ #include <dfs.h> #include <dfs_file.h> #include <dfs_posix.h> -#include <dfs_poll.h> +#include <poll.h> #ifdef RT_USING_POSIX diff --git a/components/dfs/src/dfs_posix.c b/components/dfs/src/dfs_posix.c index a7c306366f..ed3fdb2eeb 100644 --- a/components/dfs/src/dfs_posix.c +++ b/components/dfs/src/dfs_posix.c @@ -110,10 +110,10 @@ RTM_EXPORT(close); * @return the actual read data buffer length. If the returned value is 0, it * may be reach the end of file, please check errno. */ -#if defined(RT_USING_NEWLIB) && defined(_EXFUN) -_READ_WRITE_RETURN_TYPE _EXFUN(read, (int fd, void *buf, size_t len)) +#ifdef _READ_WRITE_RETURN_TYPE +_READ_WRITE_RETURN_TYPE read(int fd, void *buf, size_t len) /* some gcc tool chains will use different data structure */ #else -int read(int fd, void *buf, size_t len) +ssize_t read(int fd, void *buf, size_t len) #endif { int result; @@ -154,10 +154,10 @@ RTM_EXPORT(read); * * @return the actual written data buffer length. */ -#if defined(RT_USING_NEWLIB) && defined(_EXFUN) -_READ_WRITE_RETURN_TYPE _EXFUN(write, (int fd, const void *buf, size_t len)) +#ifdef _READ_WRITE_RETURN_TYPE +_READ_WRITE_RETURN_TYPE write(int fd, const void *buf, size_t len) /* some gcc tool chains will use different data structure */ #else -int write(int fd, const void *buf, size_t len) +ssize_t write(int fd, const void *buf, size_t len) #endif { int result; diff --git a/components/dfs/src/select.c b/components/dfs/src/dfs_select.c index c9286ca97f..ca9c549259 100644 --- a/components/dfs/src/select.c +++ b/components/dfs/src/dfs_select.c @@ -11,7 +11,7 @@ #include <dfs_fs.h> #include <dfs_posix.h> -#include <dfs_poll.h> +#include <poll.h> #include <dfs_select.h> #ifdef RT_USING_POSIX |