libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5057 from mysterywolf/posix 

[libc] fix the conflict warning of read and write functions
This commit is contained in:
Bernard Xiong 2021-09-14 22:32:15 +08:00 committed by GitHub
parent 8e3112003c e91ffdd1a0
commit 673718c0a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp/x86/drivers/floppy.c
View File

@ -357,7 +357,7 @@ void rt_floppy_init(void)
device->read = rt_floppy_read; device->read = rt_floppy_read;
device->write = rt_floppy_write; device->write = rt_floppy_write;
device->control = rt_floppy_control; device->control = rt_floppy_control;
device->user_data = NULL; device->user_data = RT_NULL;
rt_device_register(device, "floppy", rt_device_register(device, "floppy",
RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE); RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_REMOVABLE | RT_DEVICE_FLAG_STANDALONE);

8
components/dfs/src/dfs_posix.c
View File

@ -110,7 +110,11 @@ RTM_EXPORT(close);
* @return the actual read data buffer length. If the returned value is 0, it * @return the actual read data buffer length. If the returned value is 0, it
* may be reach the end of file, please check errno. * may be reach the end of file, please check errno.
*/ */
#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
ssize_t read(int fd, void *buf, size_t len) ssize_t read(int fd, void *buf, size_t len)
#endif
{ {
int result; int result;
struct dfs_fd *d; struct dfs_fd *d;
@ -150,7 +154,11 @@ RTM_EXPORT(read);
* *
* @return the actual written data buffer length. * @return the actual written data buffer length.
*/ */
#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
ssize_t write(int fd, const void *buf, size_t len) ssize_t write(int fd, const void *buf, size_t len)
#endif
{ {
int result; int result;
struct dfs_fd *d; struct dfs_fd *d;