aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-06 10:40:43 +0300
committerEli Zaretskii2014-09-06 10:40:43 +0300
commit930fb80f9e2815e599eb1de699668d42e305fa21 (patch)
tree4f42a13d42f1d63384f1bc2c5a94f381e65f6067 /src
parente872d52c93433a80c4b1eb9b8179b5d30c65dcf3 (diff)
downloademacs-930fb80f9e2815e599eb1de699668d42e305fa21.tar.gz
emacs-930fb80f9e2815e599eb1de699668d42e305fa21.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/Makefile.in3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9b0f435881f..351e46259f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-09-06 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416)
4
12014-09-04 Jan D <jhd@f20.localdomain> 52014-09-04 Jan D <jhd@f20.localdomain>
2 6
3 * xterm.c (x_term_init): Don't call x_session_initialize if running 7 * xterm.c (x_term_init): Don't call x_session_initialize if running
@@ -2571,7 +2575,7 @@
2571 2575
2572 Use mmap(2) emulation for allocating buffer text on MS-Windows. 2576 Use mmap(2) emulation for allocating buffer text on MS-Windows.
2573 * Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from 2577 * Makefile.in (C_HEAP_SWITCH): Get the predefined heap size from
2574 configure. 2578 configure, not from HEAPSIZE.
2575 (ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used. 2579 (ADDSECTION, MINGW_TEMACS_POST_LINK): Remove, no longer used.
2576 2580
2577 * lisp.h (NONPOINTER_BITS): Modify the condition to define to zero 2581 * 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@
297 297
298RUN_TEMACS = ./temacs 298RUN_TEMACS = ./temacs
299 299
300## Static heap size for temacs on MinGW.
301EMACS_HEAPSIZE = @EMACS_HEAPSIZE@
302
303UNEXEC_OBJ = @UNEXEC_OBJ@ 300UNEXEC_OBJ = @UNEXEC_OBJ@
304 301
305CANNOT_DUMP=@CANNOT_DUMP@ 302CANNOT_DUMP=@CANNOT_DUMP@