From 08a0c88da5f52f43b4c995984a91257b5ce352dd Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Wed, 3 Oct 2007 18:55:56 +0000 Subject: 2007-10-03 Bernd Becker * include/io.h (__finddata64_t, __wfinddata64_t): changed member 'size' from '_fsize_t' to '__int64' to be consistent with the other ...64 structures and the value set there is 8 bytes not 4. Add guard for both as the are only used by functions available from 6.1 on. * include/malloc.h (_HEAP_MAXREQ): Define. (_aligned_offset_recalloc): Define. (_aligned_recalloc()): Define. * include/math.h: fixed a typo in a comment. (atanhf): Fixed declaration. * include/wchar.h (__wfinddata64_t): changed member 'size' from '_fsize_t' to '__int64' to be consistent with the other ...64 structures and the value set there is 8 bytes not 4. Added guard as this function is only used by functions available from 6.1 on. * include/sys/stat.h: some members of 'stat' were declared with types with a prefixed underscore, while the ones without the underscore should have been used. Added guard to '__stat64' as it is only used by functions available from 6.1 on. Added the wide character versions of the exec()/spawn() family for completion (_stati64): changed the type of the 'st_mode' member from 'unsigned int' to '_mode_t' * include/sys/timeb.h (timeb, _timb): changed the type of the 'time' member from 'long' to 'time_t' (__timeb64): moved declaration of structure directly before the declaration of the function '_ftime64()', so it is guarded as well * include/sys/utime.h (__utimbuf64): moved declaration of structure directly before the declaration of the functions using it, so it is guarded as well --- winsup/mingw/include/sys/timeb.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'winsup/mingw/include/sys/timeb.h') diff --git a/winsup/mingw/include/sys/timeb.h b/winsup/mingw/include/sys/timeb.h index 9e9308c5e..24af3673f 100644 --- a/winsup/mingw/include/sys/timeb.h +++ b/winsup/mingw/include/sys/timeb.h @@ -22,7 +22,7 @@ */ struct _timeb { - long time; + time_t time; short millitm; short timezone; short dstflag; @@ -34,21 +34,13 @@ struct _timeb */ struct timeb { - long time; + time_t time; short millitm; short timezone; short dstflag; }; #endif -struct __timeb64 -{ - __time64_t time; - short millitm; - short timezone; - short dstflag; -}; - #ifdef __cplusplus extern "C" { #endif @@ -62,6 +54,14 @@ _CRTIMP void __cdecl __MINGW_NOTHROW ftime (struct timeb*); /* This requires newer versions of msvcrt.dll (6.10 or higher). */ #if __MSVCRT_VERSION__ >= 0x0601 +struct __timeb64 +{ + __time64_t time; + short millitm; + short timezone; + short dstflag; +}; + _CRTIMP void __cdecl __MINGW_NOTHROW _ftime64 (struct __timeb64*); #endif /* __MSVCRT_VERSION__ >= 0x0601 */ -- cgit v1.2.3