diff options
| author | Bernard Xiong <[email protected]> | 2021-12-05 13:16:39 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-05 13:16:39 +0800 |
| commit | 36d51542565800d503ad204d882e4b1dd3fcfe7d (patch) | |
| tree | debed47f95688577bcbde7846fd9892e9283668e /components/libc/compilers/common/sys | |
| parent | 04535363844d30971edca03f643fc92ba2cd40a7 (diff) | |
| parent | 1040f4a3479b3751a7ad5d5383b62d602fccabed (diff) | |
Merge pull request #5320 from mysterywolf/pse-master
[POSIX] move PSE branch to master
Diffstat (limited to 'components/libc/compilers/common/sys')
| -rw-r--r-- | components/libc/compilers/common/sys/ioctl.h | 2 | ||||
| -rw-r--r-- | components/libc/compilers/common/sys/time.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/components/libc/compilers/common/sys/ioctl.h b/components/libc/compilers/common/sys/ioctl.h index 04f73837bc..29ed3a8b84 100644 --- a/components/libc/compilers/common/sys/ioctl.h +++ b/components/libc/compilers/common/sys/ioctl.h @@ -11,9 +11,7 @@ #define _SYS_IOCTL_H #include <rtconfig.h> -#ifdef RT_USING_POSIX #include <dfs_posix.h> -#endif #ifdef _WIN32 #include <winsock.h> diff --git a/components/libc/compilers/common/sys/time.h b/components/libc/compilers/common/sys/time.h index d14905ebfb..93e3bb7ba4 100644 --- a/components/libc/compilers/common/sys/time.h +++ b/components/libc/compilers/common/sys/time.h @@ -72,7 +72,6 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz); struct tm *gmtime_r(const time_t *timep, struct tm *r); #endif -#ifdef RT_USING_POSIX /* POSIX clock and timer */ #define MILLISECOND_PER_SECOND 1000UL #define MICROSECOND_PER_SECOND 1000000UL @@ -103,8 +102,8 @@ int clock_getres (clockid_t clockid, struct timespec *res); int clock_gettime (clockid_t clockid, struct timespec *tp); int clock_settime (clockid_t clockid, const struct timespec *tp); int rt_timespec_to_tick(const struct timespec *time); -#endif /* RT_USING_POSIX */ +/* timezone */ void tz_set(int8_t tz); int8_t tz_get(void); int8_t tz_is_dst(void); |