Browse Source

配合mlibc,内核修改部分

林振兴 4 years ago
parent
commit
9196df6748

+ 1 - 4
components/dfs/include/dfs_poll.h

@@ -13,11 +13,8 @@
 #include <rtthread.h>
 
 #ifdef RT_USING_POSIX
-#if defined(RT_USING_MLIB)
-#include <time.h>
-#else
 #include <sys/time.h> /* for struct timeval */
-#endif
+
 #if !defined(POLLIN) && !defined(POLLOUT)
 #define POLLIN          (0x01)
 #define POLLRDNORM      (0x01)

+ 0 - 2
components/libc/time/clock_time.c

@@ -10,8 +10,6 @@
  */
 
 #include <rtthread.h>
-//#include <pthread.h>
-
 #include "clock_time.h"
 
 static struct timeval _timevalue;

+ 1 - 2
components/lwp/lwp.h

@@ -36,9 +36,8 @@
 #include "lwp_arch.h"
 #endif
 
-#if defined(RT_USING_MLIB)
 #include <locale.h>
-#endif
+
 
 #ifdef __cplusplus
 extern "C" {

+ 0 - 4
components/lwp/lwp_syscall.h

@@ -15,11 +15,7 @@
 #include <rtthread.h>
 #include <dfs_posix.h>
 #include <dfs_poll.h>
-#if defined(RT_USING_MLIB)
-#include <time.h>
-#else
 #include <sys/time.h>
-#endif
 #include <sys/types.h>
 
 #ifdef __cplusplus

+ 0 - 4
components/net/lwip-2.1.2/src/arch/include/arch/cc.h

@@ -46,11 +46,7 @@
 #define X32_F "lx"
 
 #if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION))
-#if defined(RT_USING_MLIB)
-#include <time.h>
-#else
 #include <sys/time.h>
-#endif
 
 #define LWIP_TIMEVAL_PRIVATE	   0
 #else

+ 0 - 4
components/net/sal_socket/src/sal_socket.c

@@ -11,11 +11,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#if defined(RT_USING_MLIB)
-#include <time.h>
-#else 
 #include <sys/time.h>
-#endif
 #include <sal_socket.h>
 #include <sal_netdb.h>
 #ifdef SAL_USING_TLS