]> git.eshelyaron.com Git - emacs.git/commit
Internal linkage for gmalloc etc. if HYBRID_MALLOC
authorWolfgang Jenkner <wjenkner@inode.at>
Sat, 30 Jan 2016 22:20:55 +0000 (14:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 30 Jan 2016 23:26:06 +0000 (15:26 -0800)
commitcb22fce283e3852ea33a09f40707cf0c004c717e
treef5d16201ab6b8afa06401a7b9e7d2d3deadc225e
parent935b4d0ce4b1f03dedd276548fd506bea1f0c0fd
Internal linkage for gmalloc etc. if HYBRID_MALLOC

This avoids clashes with symbols if the after-dump malloc is
derived from Doug Lea's implementation (Bug#22086).

* src/gmalloc.c (emacs_abort, __morecore, __default_morecore):
Move declarations up.  For HYBRID_MALLOC, turn all `extern'
declarations below to `static' ones.
(aligned_alloc): Declare for !MSDOS as well.
(heapsize, _fraghead): Move resp. copy declaration downwards.
For HYBRID_MALLOC, conditionalize out the other definitions,
since the previous `static' declarations double as tentative
definitions, anyway.
(_malloc, _free, _realloc, __free_hook, _aligned_blocks)
(__realloc_hook, __memalign_hook): Conditionalize out.
(cfree, memalign, valloc): Ditto.
src/gmalloc.c