libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2567 from zhaojuntao/fix-libc&errno

Browse Source 
Fix libc&errno
This commit is contained in:
Bernard Xiong 2019-04-12 00:09:50 +08:00 committed by GitHub
commit 16e8f34e46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/libc/compilers/newlib/syscalls.c
View File

@ -27,6 +27,14 @@
/* Reentrant versions of system calls. */ /* Reentrant versions of system calls. */
#ifndef _REENT_ONLY
int *
__errno ()
{
return _rt_errno();
}
#endif
int int
_close_r(struct _reent *ptr, int fd) _close_r(struct _reent *ptr, int fd)
{ {

8
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
View File

@ -55,10 +55,8 @@ typedef uintptr_t mem_ptr_t;
#define X32_F "lx" #define X32_F "lx"
#ifdef RT_USING_LIBC #ifdef RT_USING_LIBC
#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) #if !defined(__CC_ARM) && !defined(__IAR_SYSTEMS_ICC__)
#include <sys/errno.h>
#else
#include <errno.h>
/* some errno not defined in newlib */ /* some errno not defined in newlib */
#define ENSRNOTFOUND 163 /* Domain name not found */ #define ENSRNOTFOUND 163 /* Domain name not found */
/* WARNING: ESHUTDOWN also not defined in newlib. We chose /* WARNING: ESHUTDOWN also not defined in newlib. We chose
@ -66,8 +64,6 @@ typedef uintptr_t mem_ptr_t;
in arch.h has been assigned to another error code. */ in arch.h has been assigned to another error code. */
#define ESHUTDOWN 180 #define ESHUTDOWN 180
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */ #endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
#else
#define LWIP_PROVIDE_ERRNO
#endif #endif
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) #if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)

2
include/libc/libc_errno.h
View File

@ -13,7 +13,7 @@
#include <rtconfig.h> #include <rtconfig.h>
#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) #if defined(RT_USING_NEWLIB) || defined(_WIN32)
/* use errno.h file in toolchains */ /* use errno.h file in toolchains */
#include <errno.h> #include <errno.h>
#endif #endif