* 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
This commit is contained in:
Chris Sutcliffe
2007-10-03 18:55:56 +00:00
parent 26c28af8b2
commit 08a0c88da5
8 changed files with 121 additions and 48 deletions

View File

@ -103,14 +103,14 @@ struct _stat
/* NOTE: Must be the same as _stat above. */
struct stat
{
_dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */
_ino_t st_ino; /* Always zero ? */
_mode_t st_mode; /* See above constants */
dev_t st_dev; /* Equivalent to drive number 0=A 1=B ... */
ino_t st_ino; /* Always zero ? */
mode_t st_mode; /* See above constants */
short st_nlink; /* Number of links. */
short st_uid; /* User: Maybe significant on NT ? */
short st_gid; /* Group: Ditto */
_dev_t st_rdev; /* Seems useless (not even filled in) */
_off_t st_size; /* File size in bytes */
dev_t st_rdev; /* Seems useless (not even filled in) */
off_t st_size; /* File size in bytes */
time_t st_atime; /* Accessed date (always 00:00 hrs local
* on FAT) */
time_t st_mtime; /* Modified time */
@ -122,7 +122,7 @@ struct stat
struct _stati64 {
_dev_t st_dev;
_ino_t st_ino;
unsigned short st_mode;
_mode_t st_mode;
short st_nlink;
short st_uid;
short st_gid;
@ -132,7 +132,7 @@ struct _stati64 {
time_t st_mtime;
time_t st_ctime;
};
#if __MSVCRT_VERSION__ >= 0x0601
struct __stat64
{
_dev_t st_dev;
@ -147,6 +147,7 @@ struct __stat64
__time64_t st_mtime;
__time64_t st_ctime;
};
#endif /* __MSVCRT_VERSION__ */
#endif /* __MSVCRT__ */
#define _STAT_DEFINED
#endif /* _STAT_DEFINED */

View File

@ -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 */

View File

@ -41,13 +41,6 @@ struct utimbuf
};
#endif /* Not _NO_OLDNAMES */
struct __utimbuf64
{
__time64_t actime;
__time64_t modtime;
};
#ifdef __cplusplus
extern "C" {
#endif
@ -68,6 +61,12 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _wutime (const wchar_t*, struct _utimbuf*);
/* These require newer versions of msvcrt.dll (6.10 or higher). */
#if __MSVCRT_VERSION__ >= 0x0601
struct __utimbuf64
{
__time64_t actime;
__time64_t modtime;
};
_CRTIMP int __cdecl __MINGW_NOTHROW _utime64 (const char*, struct __utimbuf64*);
_CRTIMP int __cdecl __MINGW_NOTHROW _wutime64 (const wchar_t*, struct __utimbuf64*);
_CRTIMP int __cdecl __MINGW_NOTHROW _futime64 (int, struct __utimbuf64*);