summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-09-06 10:40:43 +0300
committerEli Zaretskii <eliz@gnu.org>2014-09-06 10:40:43 +0300
commit930fb80f9e2815e599eb1de699668d42e305fa21 (patch)
tree4f42a13d42f1d63384f1bc2c5a94f381e65f6067
parente872d52c93433a80c4b1eb9b8179b5d30c65dcf3 (diff)
downloademacs-930fb80f9e2815e599eb1de699668d42e305fa21.tar.gz
Remove unused variable EMACS_HEAPSIZE from src/Makefile.in.
src/Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416) ChangeLog: Mention explicitly the removal of EMACS_HEAPSIZE.
-rw-r--r--ChangeLog1
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.in3
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bbf651057f8..4b2d9f9329f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -368,6 +368,7 @@
dumped heap size depending on 32/64bits arch on Windows.
Don't check for pthreads.h on MinGW32/64, it gets in the way.
Use mmap(2) for buffers and system malloc for MinGW32/64.
+ (EMACS_HEAPSIZE): Remove.
2014-05-27 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/src/ChangeLog b/src/ChangeLog
index 9b0f435881f..351e46259f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-06 Eli Zaretskii <eliz@gnu.org>
+
+ * Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416)
+
2014-09-04 Jan D <jhd@f20.localdomain>
* xterm.c (x_term_init): Don't call x_session_initialize if running
@@ -2571,7 +2575,7 @@
Use mmap(2) emulation for allocating buffer text on MS-Windows.
* Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
- configure.
+ configure, not from HEAPSIZE.
(ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
* lisp.h (NONPOINTER_BITS): Modify the condition to define to zero
diff --git a/src/Makefile.in b/src/Makefile.in
index 60c783e00d6..dfa5854489b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -297,9 +297,6 @@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
RUN_TEMACS = ./temacs
-## Static heap size for temacs on MinGW.
-EMACS_HEAPSIZE = @EMACS_HEAPSIZE@
-
UNEXEC_OBJ = @UNEXEC_OBJ@
CANNOT_DUMP=@CANNOT_DUMP@