]> granicus.if.org Git - gc/commit
Fix MS VC redefinition warning for functions declared with GC_ATTR_MALLOC
authorIvan Maidanski <ivmai@mail.ru>
Tue, 22 Apr 2014 21:28:32 +0000 (01:28 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Fri, 2 May 2014 20:40:21 +0000 (00:40 +0400)
commit66d3375e520b996168b3e2f83bc1c6d32453693f
treef503192a670d7e3e7170e911d5b5c40f48640bc4
parent5467ebb6014c582719408a7ed56a0299d59aa741
Fix MS VC redefinition warning for functions declared with GC_ATTR_MALLOC
(Apply commit 36aa13d from 'master' branch.)

* dbg_mlc.c (GC_debug_malloc, GC_debug_malloc_ignore_off_page,
GC_debug_malloc_atomic_ignore_off_page, GC_debug_malloc_stubborn,
GC_debug_malloc_atomic, GC_debug_strdup, GC_debug_strndup,
GC_debug_wcsdup, GC_debug_malloc_uncollectable,
GC_debug_malloc_atomic_uncollectable,
GC_debug_generic_or_special_malloc, GC_debug_malloc_replacement): Add
GC_ATTR_MALLOC attribute to API function definition (to avoid MS VC
warning about redefinition of a symbol previously declared with
__declspec).
* fnlz_mlc.c (GC_finalized_malloc): Likewise.
* gcj_mlc.c (GC_gcj_malloc, GC_debug_gcj_malloc,
GC_gcj_malloc_ignore_off_page): Likewise.
* malloc.c (GC_generic_malloc, GC_malloc_atomic, GC_malloc,
GC_malloc_uncollectable): Likewise.
* mallocx.c (GC_generic_or_special_malloc,
GC_generic_malloc_ignore_off_page, GC_malloc_ignore_off_page,
GC_malloc_atomic_ignore_off_page, GC_malloc_many, GC_memalign,
GC_malloc_atomic_uncollectable, GC_strdup, GC_strndup, GC_wcsdup):
Likewise.
* stubborn.c (GC_malloc_stubborn): Likewise.
* thread_local_alloc.c (GC_malloc, GC_malloc_atomic, GC_gcj_malloc):
Likewise.
* typd_mlc.c (GC_malloc_explicitly_typed,
GC_malloc_explicitly_typed_ignore_off_page,
GC_calloc_explicitly_typed): Likewise.

Conflicts:

    dbg_mlc.c
    mallocx.c
dbg_mlc.c
fnlz_mlc.c
gcj_mlc.c
malloc.c
mallocx.c
stubborn.c
thread_local_alloc.c
typd_mlc.c