Merge pull request #1931 from hichard/renhaibo-branch

修复IAR dlib的时间映射,从rtt历史版本找到iar支持64bit时间的起始版本
This commit is contained in:
Bernard Xiong 2018-10-27 14:27:33 +08:00 committed by GitHub
commit 5d9a27d16d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions

View File

@ -41,10 +41,15 @@ int gettimeofday(struct timeval *tp, void *ignore)
* *
*/ */
#pragma module_name = "?time" #pragma module_name = "?time"
#if _DLIB_TIME_ALLOW_64 #if _DLIB_TIME_USES_64
__time64_t __time64(__time64_t *t) time_t __time64(time_t *t)
#else #else
__time32_t __time32(__time32_t *t) /* for IAR 6.2 later Compiler */
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
time_t __time32(time_t *t)
#else
time_t time(time_t *t)
#endif
#endif #endif
{ {
time_t time_now = 0; time_t time_now = 0;