diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2015-04-11 10:25:45 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2015-05-11 18:56:42 +0300 |
| commit | 54dbd6bfb4bb6336b447fbe6351a8457f52c8b16 (patch) | |
| tree | e8fe08eeb86440caea215f6bb09c44dfd92057c5 /mallocx.c | |
| parent | e05caf837e4dfa97ac84349e23e271bd1aa3ee7c (diff) | |
| download | bdwgc-54dbd6bfb4bb6336b447fbe6351a8457f52c8b16.tar.gz | |
Rename ATOMIC_UNCOLLECTABLE to GC_ATOMIC_UNCOLLECTABLE
(code refactoring)
* Makefile.direct (CFLAGS): Add GC_ prefix to ATOMIC_UNCOLLECTABLE.
* SMakefile.amiga: Likewise.
* configure.ac (enable_atomic_uncollectible): Likewise.
* dbg_mlc.c (GC_print_obj, GC_debug_malloc_atomic_uncollectable,
GC_debug_free, GC_debug_realloc): Likewise.
* doc/README.Mac: Likewise.
* doc/README.macros (ATOMIC_UNCOLLECTABLE): Likewise.
* extra/AmigaOS.c (GC_amiga_allocwrapper_any): Likewise.
* include/new_gc_alloc.h: Likewise.
* include/private/gc_priv.h (struct _GC_arrays, AUNCOLLECTABLE):
Likewise.
* mallocx.c (GC_auobjfreelist_ptr, GC_generic_or_special_malloc,
GC_malloc_atomic_uncollectable): Likewise.
* mark.c (GC_obj_kinds, GC_N_KINDS_INITIAL_VALUE): Likewise.
* include/private/gc_priv.h (GC_ATOMIC_UNCOLLECTABLE): Define if
ATOMIC_UNCOLLECTABLE defined (for compatibility with the clients that
do not use GC makefiles).
Diffstat (limited to 'mallocx.c')
| -rw-r--r-- | mallocx.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -42,7 +42,7 @@ void ** const GC_objfreelist_ptr = GC_objfreelist; void ** const GC_aobjfreelist_ptr = GC_aobjfreelist; void ** const GC_uobjfreelist_ptr = GC_uobjfreelist; -# ifdef ATOMIC_UNCOLLECTABLE +# ifdef GC_ATOMIC_UNCOLLECTABLE void ** const GC_auobjfreelist_ptr = GC_auobjfreelist; # endif @@ -70,10 +70,10 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_generic_or_special_malloc(size_t lb, return GC_malloc(lb); case UNCOLLECTABLE: return GC_malloc_uncollectable(lb); -# ifdef ATOMIC_UNCOLLECTABLE +# ifdef GC_ATOMIC_UNCOLLECTABLE case AUNCOLLECTABLE: return GC_malloc_atomic_uncollectable(lb); -# endif /* ATOMIC_UNCOLLECTABLE */ +# endif default: return GC_generic_malloc(lb, knd); } @@ -513,7 +513,7 @@ GC_API int GC_CALL GC_posix_memalign(void **memptr, size_t align, size_t lb) return 0; } -#ifdef ATOMIC_UNCOLLECTABLE +#ifdef GC_ATOMIC_UNCOLLECTABLE /* Allocate lb bytes of pointer-free, untraced, uncollectible data */ /* This is normally roughly equivalent to the system malloc. */ /* But it may be useful if malloc is redefined. */ @@ -564,7 +564,7 @@ GC_API int GC_CALL GC_posix_memalign(void **memptr, size_t align, size_t lb) return((void *) op); } } -#endif /* ATOMIC_UNCOLLECTABLE */ +#endif /* GC_ATOMIC_UNCOLLECTABLE */ /* provide a version of strdup() that uses the collector to allocate the copy of the string */ |