diff options
Diffstat (limited to 'mysys/mulalloc.c')
| -rw-r--r-- | mysys/mulalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c index bada0a55a6a..f4ca3d9f9ab 100644 --- a/mysys/mulalloc.c +++ b/mysys/mulalloc.c @@ -31,11 +31,11 @@ NULL */ -gptr my_multi_malloc(myf myFlags, ...) +void* my_multi_malloc(myf myFlags, ...) { va_list args; char **ptr,*start,*res; - uint tot_length,length; + size_t tot_length,length; DBUG_ENTER("my_multi_malloc"); va_start(args,myFlags); @@ -59,5 +59,5 @@ gptr my_multi_malloc(myf myFlags, ...) res+=ALIGN_SIZE(length); } va_end(args); - DBUG_RETURN((gptr) start); + DBUG_RETURN((void*) start); } |