2007-10-03 Bernd Becker <hugin@users.sourceforge.net>
* 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:
@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* io.h
|
||||
* This file has no copyright assigned and is placed in the Public Domain.
|
||||
* This file is a part of the mingw-runtime package.
|
||||
@ -50,7 +50,7 @@ typedef unsigned long _fsize_t;
|
||||
/*
|
||||
* The maximum length of a file name. You should use GetVolumeInformation
|
||||
* instead of this constant. But hey, this works.
|
||||
* Also defined in stdio.h.
|
||||
* Also defined in stdio.h.
|
||||
*/
|
||||
#ifndef FILENAME_MAX
|
||||
#define FILENAME_MAX (260)
|
||||
@ -79,14 +79,17 @@ struct _finddatai64_t {
|
||||
char name[FILENAME_MAX];
|
||||
};
|
||||
|
||||
#if __MSVCRT_VERSION__ >= 0x0601
|
||||
struct __finddata64_t {
|
||||
unsigned attrib;
|
||||
__time64_t time_create;
|
||||
__time64_t time_access;
|
||||
__time64_t time_create;
|
||||
__time64_t time_access;
|
||||
__time64_t time_write;
|
||||
_fsize_t size;
|
||||
/* 8 bytes are returned so it can't be _fsize_t */
|
||||
__int64 size;
|
||||
char name[FILENAME_MAX];
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifndef _WFINDDATA_T_DEFINED
|
||||
struct _wfinddata_t {
|
||||
@ -107,14 +110,17 @@ struct _wfinddatai64_t {
|
||||
wchar_t name[FILENAME_MAX];
|
||||
};
|
||||
|
||||
#if __MSVCRT_VERSION__ >= 0x0601
|
||||
struct __wfinddata64_t {
|
||||
unsigned attrib;
|
||||
__time64_t time_create;
|
||||
__time64_t time_create;
|
||||
__time64_t time_access;
|
||||
__time64_t time_write;
|
||||
_fsize_t size;
|
||||
/* 8 bytes are returned so it can't be _fsize_t */
|
||||
__int64 size;
|
||||
wchar_t name[FILENAME_MAX];
|
||||
};
|
||||
#endif
|
||||
|
||||
#define _WFINDDATA_T_DEFINED
|
||||
#endif
|
||||
@ -152,10 +158,9 @@ _CRTIMP __int64 __cdecl __MINGW_NOTHROW _telli64(int);
|
||||
_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirst64(const char*, struct __finddata64_t*);
|
||||
_CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findnext64(intptr_t, struct __finddata64_t*);
|
||||
#endif /* __MSVCRT_VERSION__ >= 0x0601 */
|
||||
|
||||
#ifndef __NO_MINGW_LFS
|
||||
__CRT_INLINE off64_t lseek64 (int, off64_t, int);
|
||||
__CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
|
||||
__CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
|
||||
{
|
||||
return _lseeki64(fd, (__int64) offset, whence);
|
||||
}
|
||||
|
Reference in New Issue
Block a user