Browse Source

[libc][time]修复MDK编译环境下difftime()函数多重定义的问题 (#8174)

梁生 1 year ago
parent
commit
0f5334586a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      components/libc/compilers/common/ctime.c

+ 2 - 2
components/libc/compilers/common/ctime.c

@@ -325,12 +325,12 @@ char *ctime(const time_t *tim_p)
 }
 }
 RTM_EXPORT(ctime);
 RTM_EXPORT(ctime);
 
 
-#ifndef __ICCARM__
+#if (!defined __ARMCC_VERSION) && (!defined __CC_ARM) && (!defined __ICCARM__)
 double difftime(time_t time1, time_t time2)
 double difftime(time_t time1, time_t time2)
 {
 {
     return (double)(time1 - time2);
     return (double)(time1 - time2);
 }
 }
-#endif /* __ICCARM__ */
+#endif
 RTM_EXPORT(difftime);
 RTM_EXPORT(difftime);
 
 
 RTM_EXPORT(strftime); /* inherent in the toolchain */
 RTM_EXPORT(strftime); /* inherent in the toolchain */