From e1e1596cbdc44e8c2a41908117185b306df9f4a5 Mon Sep 17 00:00:00 2001 From: "Man, Jianting (Meco)" <920369182@qq.com> Date: Thu, 30 Jun 2022 21:15:29 -0400 Subject: [PATCH] =?UTF-8?q?[iar]=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20(#6126)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/libc/compilers/common/cctype.c | 2 ++ components/libc/compilers/common/cstdio.c | 2 ++ components/libc/compilers/common/include/posix/ctype.h | 3 +++ components/libc/compilers/common/include/posix/stdio.h | 2 ++ 4 files changed, 9 insertions(+) diff --git a/components/libc/compilers/common/cctype.c b/components/libc/compilers/common/cctype.c index ddcff1b39d..3bfb9fe843 100644 --- a/components/libc/compilers/common/cctype.c +++ b/components/libc/compilers/common/cctype.c @@ -10,12 +10,14 @@ #include "posix/ctype.h" +#if !(defined(__ICCARM__) && (__VER__ > 9000000)) /* IAR9.0 has defined */ #ifndef isascii /* some toolchain use macro to define it */ int isascii(int c) { return c >= 0x00 && c <= 0x7f; } #endif +#endif /* !(defined(__ICCARM__) && (__VER__ > 9000000)) */ #ifndef toascii int toascii(int c) diff --git a/components/libc/compilers/common/cstdio.c b/components/libc/compilers/common/cstdio.c index 3dffe55aa7..fc14c0b9c3 100644 --- a/components/libc/compilers/common/cstdio.c +++ b/components/libc/compilers/common/cstdio.c @@ -13,6 +13,7 @@ #include #include +#ifdef DFS_USING_POSIX ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream) { char *cur_pos, *new_lineptr; @@ -83,3 +84,4 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream) { return getdelim(lineptr, n, '\n', stream); } +#endif /* DFS_USING_POSIX */ diff --git a/components/libc/compilers/common/include/posix/ctype.h b/components/libc/compilers/common/include/posix/ctype.h index 0ac42e3faf..da805af249 100644 --- a/components/libc/compilers/common/include/posix/ctype.h +++ b/components/libc/compilers/common/include/posix/ctype.h @@ -17,9 +17,12 @@ extern "C" { #include +#if !(defined(__ICCARM__) && (__VER__ > 9000000)) /* IAR9.0 has defined */ #ifndef isascii /* some toolchain use macro to define it */ int isascii(int c); #endif +#endif /* !(defined(__ICCARM__) && (__VER__ > 9000000)) */ + #ifndef toascii int toascii(int c); #endif diff --git a/components/libc/compilers/common/include/posix/stdio.h b/components/libc/compilers/common/include/posix/stdio.h index 7dea03bb0d..a2cf01f6b6 100644 --- a/components/libc/compilers/common/include/posix/stdio.h +++ b/components/libc/compilers/common/include/posix/stdio.h @@ -18,8 +18,10 @@ extern "C" { #include #include +#ifdef DFS_USING_POSIX ssize_t getdelim(char **lineptr, size_t *n, int delim, FILE *stream); ssize_t getline(char **lineptr, size_t *n, FILE *stream); +#endif /* DFS_USING_POSIX */ #ifdef __cplusplus } -- GitLab