summaryrefslogtreecommitdiff
path: root/mallocx.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2021-07-25 22:43:44 +0300
committerIvan Maidanski <ivmai@mail.ru>2021-07-25 22:43:44 +0300
commit2b3873928304b0dd5b2575092cbc508a91d3ae55 (patch)
treec55157da455ac36b675d810b5d0e569bab196ca7 /mallocx.c
parent9abc279f49317713cb9bc582eb87d062ad66d4d8 (diff)
downloadbdwgc-2b3873928304b0dd5b2575092cbc508a91d3ae55.tar.gz
Remove new_gc_alloc.h file
The removed header was not exported anyway and provided the SGI-style allocators depending on an ancient STL version. * Makefile.direct (SRCS): Remove include/new_gc_alloc.h; rename include/gc_alloc_ptrs.h to include/private/gc_alloc_ptrs.h. * include/include.am (dist_noinst_HEADERS): Likewise. * doc/gcinterface.md (STL allocators): Remove information about SGI-style allocators (defined in new_gc_alloc.h). * include/new_gc_alloc.h: Remove file. * include/gc_alloc_ptrs.h: Move to include/private folder. * include/private/gc_alloc_ptrs.h [!GC_API_PRIV] (GC_API_PRIV): Define. * include/private/gc_alloc_ptrs.h (GC_objfreelist_ptr, GC_aobjfreelist_ptr, GC_uobjfreelist_ptr, GC_incr_bytes_allocd, GC_incr_bytes_freed): Use GC_API_PRIV instead of GC_API. * include/private/gc_alloc_ptrs.h [GC_ATOMIC_UNCOLLECTABLE] (GC_auobjfreelist_ptr): Likewise. * mallocx.c: Include private/gc_alloc_ptrs.h (instead of gc_alloc_ptrs.h). * mallocx.c (GC_incr_bytes_allocd, GC_incr_bytes_freed): Remove GC_API. * tests/test_cpp.cc: Include "gc_allocator.h" (even if DONT_USE_STD_ALLOCATOR). * tests/test_cpp.cc (main): Remove code inside ifdef DONT_USE_STD_ALLOCATOR blocks.
Diffstat (limited to 'mallocx.c')
-rw-r--r--mallocx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mallocx.c b/mallocx.c
index 439b928d..216ffdc2 100644
--- a/mallocx.c
+++ b/mallocx.c
@@ -34,7 +34,7 @@
/* Some externally visible but unadvertised variables to allow access to */
/* free lists from inlined allocators without including gc_priv.h */
/* or introducing dependencies on internal data structure layouts. */
-#include "gc_alloc_ptrs.h"
+#include "private/gc_alloc_ptrs.h"
void ** const GC_objfreelist_ptr = GC_objfreelist;
void ** const GC_aobjfreelist_ptr = GC_aobjfreelist;
void ** const GC_uobjfreelist_ptr = GC_uobjfreelist;
@@ -249,13 +249,13 @@ GC_API GC_ATTR_MALLOC void * GC_CALL
/* Increment GC_bytes_allocd from code that doesn't have direct access */
/* to GC_arrays. */
-GC_API void GC_CALL GC_incr_bytes_allocd(size_t n)
+void GC_CALL GC_incr_bytes_allocd(size_t n)
{
GC_bytes_allocd += n;
}
/* The same for GC_bytes_freed. */
-GC_API void GC_CALL GC_incr_bytes_freed(size_t n)
+void GC_CALL GC_incr_bytes_freed(size_t n)
{
GC_bytes_freed += n;
}