From: Rémi Bernon rbernon@codeweavers.com
--- dlls/msvcrt/time.c | 12 ------------ include/msvcrt/time.h | 18 ++++++++++++++++++ libs/ldap/include/ac/time.h | 7 ------- 3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 155454c5659..8199fe01649 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1867,18 +1867,6 @@ int CDECL _get_daylight(int *hours)
#define TIME_UTC 1
-struct _timespec32 -{ - __time32_t tv_sec; - LONG tv_nsec; -}; - -struct _timespec64 -{ - __time64_t tv_sec; - LONG tv_nsec; -}; - /********************************************************************* * _timespec64_get (UCRTBASE.@) */ diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 42e2fc4b1e2..05965c4dad2 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -37,6 +37,24 @@ typedef __msvcrt_long clock_t; extern "C" { #endif
+struct _timespec32 +{ + __time32_t tv_sec; + __msvcrt_long tv_nsec; +}; + +struct _timespec64 +{ + __time64_t tv_sec; + __msvcrt_long tv_nsec; +}; + +struct timespec +{ + time_t tv_sec; + __msvcrt_long tv_nsec; +}; + #ifdef __i386__ #define _daylight (*__p__daylight()) #define _dstbias (*__p__dstbias()) diff --git a/libs/ldap/include/ac/time.h b/libs/ldap/include/ac/time.h index 4cc0f914f36..0b8372fb551 100644 --- a/libs/ldap/include/ac/time.h +++ b/libs/ldap/include/ac/time.h @@ -29,11 +29,4 @@ # include <time.h> #endif
-#if defined(_WIN32) && !defined(HAVE_CLOCK_GETTIME) - struct timespec { - time_t tv_sec; - int tv_nsec; - }; -#endif - #endif /* _AC_TIME_H */