From 4bcbc3a3eb58543ef4a16e7692151b97ddda3ae7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 29 May 2019 17:45:30 -0700 Subject: [PATCH 5/5] Pacify GCC 9 -Wredundant-decls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/gmalloc.c (_fraghead) [!HYBRID_MALLOC]: Make it static in this case, too. This avoids having both ‘extern struct list _fraghead[];’ and ‘static struct list _fraghead[BLOCKLOG];’, which GCC 9 complains about. --- src/gmalloc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gmalloc.c b/src/gmalloc.c index f3b3d77aac..9284d9bd60 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -182,7 +182,7 @@ struct list }; /* Free list headers for each fragment size. */ -extern struct list _fraghead[]; +static struct list _fraghead[BLOCKLOG]; /* List of blocks allocated with aligned_alloc and friends. */ struct alignlist @@ -339,9 +339,6 @@ size_t _heapindex; /* Limit of valid info table indices. */ size_t _heaplimit; -/* Free lists for each fragment size. */ -struct list _fraghead[BLOCKLOG]; - /* Instrumentation. */ size_t _chunks_used; size_t _bytes_used; @@ -351,10 +348,6 @@ size_t _bytes_free; /* Are you experienced? */ int __malloc_initialized; -#else - -static struct list _fraghead[BLOCKLOG]; - #endif /* HYBRID_MALLOC */ /* Number of extra blocks to get each time we ask for more core. -- 2.21.0