diff options
| author | Meco Man <[email protected]> | 2021-04-15 16:34:09 +0800 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-04-15 16:34:09 +0800 |
| commit | 46d51a99f1b92738a2955245527ad8e18bcf96a5 (patch) | |
| tree | 4be2ddfb4377dd843c9c5deca70300e78a727ad4 /components | |
| parent | b74022e2c4274698aa26a18cbd6df72842f8ac38 (diff) | |
优化get_timeval set_timeval 条件编译代码结构
Diffstat (limited to 'components')
| -rw-r--r-- | components/libc/compilers/common/time.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/components/libc/compilers/common/time.c b/components/libc/compilers/common/time.c index 638735b77c..33d8907165 100644 --- a/components/libc/compilers/common/time.c +++ b/components/libc/compilers/common/time.c @@ -77,7 +77,6 @@ static int get_timeval(struct timeval *tv) { #ifdef RT_USING_RTC static rt_device_t device = RT_NULL; -#endif rt_err_t rst = -RT_ERROR; if (tv == RT_NULL) @@ -87,7 +86,6 @@ static int get_timeval(struct timeval *tv) tv->tv_sec = 0; tv->tv_usec = 0; -#ifdef RT_USING_RTC /* optimization: find rtc device only first */ if (device == RT_NULL) { @@ -127,15 +125,13 @@ static int get_timeval(struct timeval *tv) */ static int set_timeval(struct timeval *tv) { - rt_err_t rst = -RT_ERROR; #ifdef RT_USING_RTC static rt_device_t device = RT_NULL; -#endif + rt_err_t rst = -RT_ERROR; if (tv == RT_NULL) return -1; -#ifdef RT_USING_RTC /* optimization: find rtc device only first */ if (device == RT_NULL) { @@ -311,7 +307,7 @@ RT_WEAK time_t time(time_t *t) else { errno = EFAULT; - return -1; + return ((time_t)-1); } } RTM_EXPORT(time); |