aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorPaul Eggert2016-01-30 14:20:57 -0800
committerPaul Eggert2016-01-30 15:26:08 -0800
commit3d82a8ee4bd392ae536c8c3640140d1d0f594f44 (patch)
treebce897370545df1d8b65c6474f7cafe5b68cd3f5 /src/alloc.c
parent7fdc3cf046ee112b883752ea15ca8cb05444d12f (diff)
downloademacs-3d82a8ee4bd392ae536c8c3640140d1d0f594f44.tar.gz
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/alloc.c')
-rw-r--r--src/alloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c
index b1d3f2e6511..57ef4c5deab 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -22,10 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22 22
23#include <stdio.h> 23#include <stdio.h>
24#include <limits.h> /* For CHAR_BIT. */ 24#include <limits.h> /* For CHAR_BIT. */
25 25#include <signal.h> /* For SIGABRT, SIGDANGER. */
26#ifdef ENABLE_CHECKING
27#include <signal.h> /* For SIGABRT. */
28#endif
29 26
30#ifdef HAVE_PTHREAD 27#ifdef HAVE_PTHREAD
31#include <pthread.h> 28#include <pthread.h>
@@ -565,6 +562,8 @@ static struct Lisp_Finalizer doomed_finalizers;
565 Malloc 562 Malloc
566 ************************************************************************/ 563 ************************************************************************/
567 564
565#if defined SIGDANGER || (!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC)
566
568/* Function malloc calls this if it finds we are near exhausting storage. */ 567/* Function malloc calls this if it finds we are near exhausting storage. */
569 568
570void 569void
@@ -573,6 +572,7 @@ malloc_warning (const char *str)
573 pending_malloc_warning = str; 572 pending_malloc_warning = str;
574} 573}
575 574
575#endif
576 576
577/* Display an already-pending malloc warning. */ 577/* Display an already-pending malloc warning. */
578 578