Merge branch 'master' into security

1 files changed, 3 insertions, 8 deletions

diff --git a/include/rtlibc.h b/include/rtlibc.h
index 5a260d250d..4b145b1b1b 100644
--- a/include/rtlibc.h
+++ b/include/rtlibc.h
@@ -13,20 +13,15 @@
 
 /* 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"
 
-#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__IAR_SYSTEMS_ICC__)
+#ifndef RT_USING_LIBC
+#if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__)
 typedef signed long off_t;
 typedef int mode_t;
 #endif
+#endif
 
 #if defined(__MINGW32__) || defined(_WIN32)
 typedef signed long off_t;