diff options
| author | Bernard Xiong <[email protected]> | 2018-10-18 00:35:22 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-18 00:35:22 +0800 |
| commit | 9c255e7d2f0cfb696634ab51572f2dce66fb4672 (patch) | |
| tree | b030a0c41af45fac2f5a68c7465cb2fe71c812c9 /components | |
| parent | cedb9b9272c652cfb41c731308a9032bc4476f0f (diff) | |
| parent | 61656e23f2d39465c2608529b60ca64efba07fd6 (diff) | |
Merge pull request #1899 from hichard/master
修复iar dlib时间映射函数的函数声明，适应不同版本的iar
Diffstat (limited to 'components')
| -rw-r--r-- | components/libc/compilers/dlib/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/libc/compilers/dlib/time.c b/components/libc/compilers/dlib/time.c index bea01e90e5..12c7f893e9 100644 --- a/components/libc/compilers/dlib/time.c +++ b/components/libc/compilers/dlib/time.c @@ -42,9 +42,9 @@ int gettimeofday(struct timeval *tp, void *ignore) */ #pragma module_name = "?time" #if _DLIB_TIME_ALLOW_64 -time_t __time64(time_t *t) +__time64_t __time64(__time64_t *t) #else -time_t __time32(time_t *t) +__time32_t __time32(__time32_t *t) #endif { time_t time_now = 0; |