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/malloc.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'winsup/mingw/include/malloc.h') diff --git a/winsup/mingw/include/malloc.h b/winsup/mingw/include/malloc.h index 9d2c33f07..5931b5e42 100644 --- a/winsup/mingw/include/malloc.h +++ b/winsup/mingw/include/malloc.h @@ -43,6 +43,9 @@ typedef struct _heapinfo #define _HEAPEND (-5) #define _HEAPBADPTR (-6) +/* maximum size of a user request for memory */ +#define _HEAP_MAXREQ 0xFFFFFFE0 + #ifdef __cplusplus extern "C" { #endif @@ -75,9 +78,11 @@ _CRTIMP void* __cdecl __MINGW_NOTHROW _expand (void*, size_t); #if __MSVCRT_VERSION__ >= 0x0700 _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_offset_malloc(size_t, size_t, size_t); _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_offset_realloc(void*, size_t, size_t, size_t); +_CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_offset_recalloc(void*, size_t, size_t, size_t, size_t); _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_malloc (size_t, size_t); _CRTIMP void * __cdecl __MINGW_NOTHROW _aligned_realloc (void*, size_t, size_t); +_CRTIMP void* __cdecl __MINGW_NOTHROW _aligned_recalloc(void*, size_t, size_t, size_t); _CRTIMP void __cdecl __MINGW_NOTHROW _aligned_free (void*); #endif /* __MSVCRT_VERSION__ >= 0x0700 */ -- cgit v1.2.3