Skip to content

Commit e108dfe

Browse files
committed
[libc] Fix the _EXFUN issue in newlib
1 parent b69baa9 commit e108dfe

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

components/dfs/include/dfs_posix.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ int closedir(DIR* d);
4141
/* file api*/
4242
int open(const char *file, int flags, ...);
4343
int close(int d);
44-
#ifdef RT_USING_NEWLIB
44+
45+
#if defined(RT_USING_NEWLIB) && defined(_EXFUN)
4546
_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte));
4647
_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte));
4748
#else
4849
int read(int fd, void *buf, size_t len);
4950
int write(int fd, const void *buf, size_t len);
5051
#endif
52+
5153
off_t lseek(int fd, off_t offset, int whence);
5254
int rename(const char *from, const char *to);
5355
int unlink(const char *pathname);

components/dfs/src/dfs_posix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ RTM_EXPORT(close);
110110
* @return the actual read data buffer length. If the returned value is 0, it
111111
* may be reach the end of file, please check errno.
112112
*/
113-
#ifdef RT_USING_NEWLIB
113+
#if defined(RT_USING_NEWLIB) && defined(_EXFUN)
114114
_READ_WRITE_RETURN_TYPE _EXFUN(read, (int fd, void *buf, size_t len))
115115
#else
116116
int read(int fd, void *buf, size_t len)
@@ -154,7 +154,7 @@ RTM_EXPORT(read);
154154
*
155155
* @return the actual written data buffer length.
156156
*/
157-
#ifdef RT_USING_NEWLIB
157+
#if defined(RT_USING_NEWLIB) && defined(_EXFUN)
158158
_READ_WRITE_RETURN_TYPE _EXFUN(write, (int fd, const void *buf, size_t len))
159159
#else
160160
int write(int fd, const void *buf, size_t len)

include/libc/libc_signal.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,20 @@ typedef struct siginfo siginfo_t;
7676
typedef unsigned long sigset_t;
7777

7878
#define SIGHUP 1
79-
// #define SIGINT 2
79+
/* #define SIGINT 2 */
8080
#define SIGQUIT 3
81-
// #define SIGILL 4
81+
/* #define SIGILL 4 */
8282
#define SIGTRAP 5
83-
// #define SIGABRT 6
83+
/* #define SIGABRT 6 */
8484
#define SIGEMT 7
85-
// #define SIGFPE 8
85+
/* #define SIGFPE 8 */
8686
#define SIGKILL 9
8787
#define SIGBUS 10
88-
// #define SIGSEGV 11
88+
/* #define SIGSEGV 11 */
8989
#define SIGSYS 12
9090
#define SIGPIPE 13
9191
#define SIGALRM 14
92-
// #define SIGTERM 15
92+
/* #define SIGTERM 15 */
9393
#define SIGURG 16
9494
#define SIGSTOP 17
9595
#define SIGTSTP 18
@@ -99,8 +99,8 @@ typedef unsigned long sigset_t;
9999
#define SIGTTOU 22
100100
#define SIGPOLL 23
101101
#define SIGWINCH 24
102-
// #define SIGUSR1 25
103-
// #define SIGUSR2 26
102+
/* #define SIGUSR1 25 */
103+
/* #define SIGUSR2 26 */
104104
#define SIGRTMIN 27
105105
#define SIGRTMAX 31
106106
#define NSIG 32
@@ -136,7 +136,7 @@ typedef unsigned long sigset_t;
136136
#define SIGQUIT 3
137137
#define SIGILL 4
138138
#define SIGTRAP 5
139-
// #define SIGABRT 6
139+
/* #define SIGABRT 6 */
140140
#define SIGEMT 7
141141
#define SIGFPE 8
142142
#define SIGKILL 9

0 commit comments

Comments
 (0)