提交 e91ffdd1 编写于 作者: mysterywolf's avatar mysterywolf

[libc] fix the conflict warning of read and write functions

上级 160d4486
...@@ -357,7 +357,7 @@ void rt_floppy_init(void) ...@@ -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);
......
...@@ -110,7 +110,11 @@ RTM_EXPORT(close); ...@@ -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); ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册