diff options
| author | Eli Zaretskii | 2014-09-06 10:40:43 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-09-06 10:40:43 +0300 |
| commit | 930fb80f9e2815e599eb1de699668d42e305fa21 (patch) | |
| tree | 4f42a13d42f1d63384f1bc2c5a94f381e65f6067 | |
| parent | e872d52c93433a80c4b1eb9b8179b5d30c65dcf3 (diff) | |
| download | emacs-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.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
3 files changed, 6 insertions, 4 deletions
| @@ -368,6 +368,7 @@ | |||
| 368 | dumped heap size depending on 32/64bits arch on Windows. | 368 | dumped heap size depending on 32/64bits arch on Windows. |
| 369 | Don't check for pthreads.h on MinGW32/64, it gets in the way. | 369 | Don't check for pthreads.h on MinGW32/64, it gets in the way. |
| 370 | Use mmap(2) for buffers and system malloc for MinGW32/64. | 370 | Use mmap(2) for buffers and system malloc for MinGW32/64. |
| 371 | (EMACS_HEAPSIZE): Remove. | ||
| 371 | 372 | ||
| 372 | 2014-05-27 Paul Eggert <eggert@cs.ucla.edu> | 373 | 2014-05-27 Paul Eggert <eggert@cs.ucla.edu> |
| 373 | 374 | ||
diff --git a/src/ChangeLog b/src/ChangeLog index 9b0f435881f..351e46259f1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-06 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (EMACS_HEAPSIZE): Remove, no longer used. (Bug#18416) | ||
| 4 | |||
| 1 | 2014-09-04 Jan D <jhd@f20.localdomain> | 5 | 2014-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 | ||
| 298 | RUN_TEMACS = ./temacs | 298 | RUN_TEMACS = ./temacs |
| 299 | 299 | ||
| 300 | ## Static heap size for temacs on MinGW. | ||
| 301 | EMACS_HEAPSIZE = @EMACS_HEAPSIZE@ | ||
| 302 | |||
| 303 | UNEXEC_OBJ = @UNEXEC_OBJ@ | 300 | UNEXEC_OBJ = @UNEXEC_OBJ@ |
| 304 | 301 | ||
| 305 | CANNOT_DUMP=@CANNOT_DUMP@ | 302 | CANNOT_DUMP=@CANNOT_DUMP@ |