Merge branch 'master' into at_client-rt_realloc_iss

# Conflicts:
#	components/net/at/src/at_client.c

1 files changed, 1 insertions, 5 deletions

diff --git a/include/rtlibc.h b/include/rtlibc.h
index 50bddc6ee8..ac44a97831 100644
--- a/include/rtlibc.h
+++ b/include/rtlibc.h
@@ -13,18 +13,14 @@
 
 /* definitions for libc if toolchain has no these definitions */
 #include "libc/libc_stat.h"
-#include "libc/libc_errno.h"
 
 #include "libc/libc_fcntl.h"
-#include "libc/libc_ioctl.h"
 #include "libc/libc_dirent.h"
 #include "libc/libc_signal.h"
 #include "libc/libc_fdset.h"
-#include "libc/libc_limits.h"
-#include "libc/libc_stdio.h"
 
 #ifndef RT_USING_LIBC
-#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__IAR_SYSTEMS_ICC__)
+#if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__)
 typedef signed long off_t;
 typedef int mode_t;
 #endif