diff options
| author | Meco Man <[email protected]> | 2021-09-18 11:37:19 -0400 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-09-18 16:46:53 -0400 |
| commit | 71f48266ffe8c51660a3a5038cb84fd0ec4b5ba2 (patch) | |
| tree | 3d4c3dc24326a0f2999c5d2a5b657d2852fbeaf5 /components/libc/compilers/common/sys | |
| parent | 163c0597b8a3a900bb8720cdd71284524b52a853 (diff) | |
[libc][time] 修复数据类型报警
Diffstat (limited to 'components/libc/compilers/common/sys')
| -rw-r--r-- | components/libc/compilers/common/sys/time.h | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h index ecf6e85ac6..d14905ebfb 100644 --- a/components/libc/compilers/common/sys/time.h +++ b/components/libc/compilers/common/sys/time.h @@ -12,7 +12,8 @@ #define __SYS_TIME_H__ #include <rtconfig.h> -#include <rtdef.h> +#include <sys/types.h> +#include <stdint.h> #include <time.h> #ifdef __cplusplus @@ -32,22 +33,19 @@ extern "C" { #define DST_TUR 9 /* Turkey */ #define DST_AUSTALT 10 /* Australian style with shift in 1986 */ -struct timezone { - int tz_minuteswest; /* minutes west of Greenwich */ - int tz_dsttime; /* type of dst correction */ +struct timezone +{ + int tz_minuteswest; /* minutes west of Greenwich */ + int tz_dsttime; /* type of dst correction */ }; -void rt_tz_set(rt_int8_t tz); -rt_int8_t rt_tz_get(void); -rt_int8_t rt_tz_is_dst(void); - /* * Structure returned by gettimeofday(2) system call, * and used in other calls. */ #ifndef _TIMEVAL_DEFINED #define _TIMEVAL_DEFINED -#if !(defined(_WIN32)) +#if !defined(_WIN32) struct timeval { time_t tv_sec; /* seconds */ @@ -56,6 +54,16 @@ struct timeval #endif #endif /* _TIMEVAL_DEFINED */ +#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)/*GCC*/) && \ + !(defined(__ICCARM__) && (__VER__ >= 8010001)) && \ + !defined(_WIN32) +struct timespec +{ + time_t tv_sec; /* seconds */ + long tv_nsec; /* and nanoseconds */ +}; +#endif + int stime(const time_t *t); time_t timegm(struct tm * const t); int gettimeofday(struct timeval *tv, struct timezone *tz); @@ -65,15 +73,6 @@ struct tm *gmtime_r(const time_t *timep, struct tm *r); #endif #ifdef RT_USING_POSIX -#include <sys/types.h> - -#if !(defined(__GNUC__) && !defined(__ARMCC_VERSION)/*GCC*/) && !(defined(__ICCARM__) && (__VER__ >= 8010001)) && !defined(_WIN32) -struct timespec { - time_t tv_sec; /* seconds */ - long tv_nsec; /* and nanoseconds */ -}; -#endif - /* POSIX clock and timer */ #define MILLISECOND_PER_SECOND 1000UL #define MICROSECOND_PER_SECOND 1000000UL @@ -106,6 +105,10 @@ int clock_settime (clockid_t clockid, const struct timespec *tp); int rt_timespec_to_tick(const struct timespec *time); #endif /* RT_USING_POSIX */ +void tz_set(int8_t tz); +int8_t tz_get(void); +int8_t tz_is_dst(void); + #ifdef __cplusplus } #endif |