diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:42 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-06-01 12:04:42 -0700 |
| commit | 7e911d007d25df9a483eaad54956a4273405574e (patch) | |
| tree | ce1e4b0eda6c940634922e71a726b5c8aa5270b4 /src/gmalloc.c | |
| parent | f17e0e93bd8dbe3b069029585dc5d2dda57c1e1e (diff) | |
| parent | 134edc10367a8434167656e631865c85b5f10c42 (diff) | |
| download | emacs-7e911d007d25df9a483eaad54956a4273405574e.tar.gz emacs-7e911d007d25df9a483eaad54956a4273405574e.tar.bz2 emacs-7e911d007d25df9a483eaad54956a4273405574e.zip | |
Merge from origin/emacs-26
134edc1 Warn about wrong number of args for subrs (Bug#35767)
5f01af6 Use plain symbols for eieio type descriptors (Bug#29220)
4b24b01 Pacify GCC 9 -Wredundant-decls
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index b6a96d55727..779cdb36d67 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -181,7 +181,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. |