diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 14:20:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 15:26:08 -0800 |
| commit | 3d82a8ee4bd392ae536c8c3640140d1d0f594f44 (patch) | |
| tree | bce897370545df1d8b65c6474f7cafe5b68cd3f5 /src/gmalloc.c | |
| parent | 7fdc3cf046ee112b883752ea15ca8cb05444d12f (diff) | |
| download | emacs-3d82a8ee4bd392ae536c8c3640140d1d0f594f44.tar.gz emacs-3d82a8ee4bd392ae536c8c3640140d1d0f594f44.tar.bz2 emacs-3d82a8ee4bd392ae536c8c3640140d1d0f594f44.zip | |
Fix extern symbols defined and not used
* src/alloc.c: Always include <signal.h>.
(malloc_warning) [!SIGDANGER && (SYSTEM_MALLOC || HYBRID_MALLOC)]:
Do not define; unused.
* src/emacs.c, src/lisp.h (might_dump) [!DOUG_LEA_MALLOC]: Now static.
* src/gmalloc.c (gdefault_morecore): Rename from __default_morecore,
to avoid collision with glibc. Now static. All uses changed.
* src/lastfile.c (my_edata): Define only if
((!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC && !defined
WINDOWSNT) \ || defined CYGWIN || defined DARWIN_OS).
(Bug#22086)
Diffstat (limited to 'src/gmalloc.c')
| -rw-r--r-- | src/gmalloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c index ca862767bb2..282216a947b 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -56,7 +56,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void); extern void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void); extern void *(*__morecore) (ptrdiff_t); -extern void *__default_morecore (ptrdiff_t); #endif /* If HYBRID_MALLOC is defined, then temacs will use malloc, @@ -1512,8 +1511,8 @@ extern void *__sbrk (ptrdiff_t increment); /* Allocate INCREMENT more bytes of data space, and return the start of data space, or NULL on errors. If INCREMENT is negative, shrink data space. */ -void * -__default_morecore (ptrdiff_t increment) +static void * +gdefault_morecore (ptrdiff_t increment) { void *result; #ifdef HYBRID_MALLOC @@ -1528,7 +1527,7 @@ __default_morecore (ptrdiff_t increment) return result; } -void *(*__morecore) (ptrdiff_t) = __default_morecore; +void *(*__morecore) (ptrdiff_t) = gdefault_morecore; /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. |