summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
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 @@
+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@