From 24557e9caaf23db2a642c7637f3c0df7c8bc9106 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 31 Jul 2013 14:43:05 +0000 Subject: * cygheap.cc (cmalloc): Use size_t for size field. (cmalloc_abort): Ditto. (crealloc): Ditto. (crealloc_abort): Ditto. (ccalloc): Ditto. (ccalloc_abort): Ditto. * cygheap_malloc.h (HEAP_USER): Add. (cmalloc): Use size_t for size field in declaration. (cmalloc_abort): Ditto. (crealloc): Ditto. (crealloc_abort): Ditto. (ccalloc): Ditto. (ccalloc_abort): Ditto. * path.cc (normalize_posix_path): Don't check existence of / or // dir in parent dir check. --- winsup/cygwin/cygheap_malloc.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'winsup/cygwin/cygheap_malloc.h') diff --git a/winsup/cygwin/cygheap_malloc.h b/winsup/cygwin/cygheap_malloc.h index a7632a940..a4ab2462e 100644 --- a/winsup/cygwin/cygheap_malloc.h +++ b/winsup/cygwin/cygheap_malloc.h @@ -25,6 +25,7 @@ enum cygheap_types HEAP_ARCHETYPES, HEAP_TLS, HEAP_COMMUNE, + HEAP_USER, HEAP_1_START, HEAP_1_HOOK, HEAP_1_STR, @@ -41,12 +42,12 @@ enum cygheap_types extern "C" { void __reg1 cfree (void *); -void *__reg2 cmalloc (cygheap_types, DWORD); -void *__reg2 crealloc (void *, DWORD); -void *__reg3 ccalloc (cygheap_types, DWORD, DWORD); -void *__reg2 cmalloc_abort (cygheap_types, DWORD); -void *__reg2 crealloc_abort (void *, DWORD); -void *__reg3 ccalloc_abort (cygheap_types, DWORD, DWORD); +void *__reg2 cmalloc (cygheap_types, size_t); +void *__reg2 crealloc (void *, size_t); +void *__reg3 ccalloc (cygheap_types, size_t, size_t); +void *__reg2 cmalloc_abort (cygheap_types, size_t); +void *__reg2 crealloc_abort (void *, size_t); +void *__reg3 ccalloc_abort (cygheap_types, size_t, size_t); PWCHAR __reg1 cwcsdup (const PWCHAR); PWCHAR __reg1 cwcsdup1 (const PWCHAR); char *__reg1 cstrdup (const char *); -- cgit v1.2.3