summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-05-30 15:06:39 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-05-30 15:29:50 -0700
commit4b24b0185d910d756e85ecdc30f49c414577050e (patch)
tree57fbd093fe75f0bdf75960a9030dded3c35ca3f0
parent7871c3dc9f38a32e1658a3579069a988b0d99623 (diff)
downloademacs-4b24b0185d910d756e85ecdc30f49c414577050e.tar.gz
Pacify GCC 9 -Wredundant-decls
* 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.
-rw-r--r--src/gmalloc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index f3b3d77aac9..9284d9bd606 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.