Mercurial > emacs
changeset 96948:d09831a9672d
* m/alpha.h (LINUX_SBRK_BUG):
* emacs.c (main): Undo previous change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 23 Jul 2008 23:37:18 +0000 |
| parents | 57b80a67db7b |
| children | 057eba119104 |
| files | src/ChangeLog src/emacs.c src/m/alpha.h |
| diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jul 23 22:40:07 2008 +0000 +++ b/src/ChangeLog Wed Jul 23 23:37:18 2008 +0000 @@ -26,8 +26,6 @@ * m/intel386.h (DATA_END): * m/ibmrs6000.h (DATA_END): * m/alpha.h (DATA_END): Remove, unused. - (LINUX_SBRK_BUG): Remove, move condition to the only use ... - * emacs.c (main): ... here. * config.in: Regenerate. * s/ms-w32.h (subprocesses): Define unconditionally.
--- a/src/emacs.c Wed Jul 23 22:40:07 2008 +0000 +++ b/src/emacs.c Wed Jul 23 23:37:18 2008 +0000 @@ -827,7 +827,8 @@ heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static); } -#if defined(GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6 +#ifdef LINUX_SBRK_BUG + /* This is only used GNU/LINUX running on alpha when using libc5 */ __sbrk (1); #endif
--- a/src/m/alpha.h Wed Jul 23 22:40:07 2008 +0000 +++ b/src/m/alpha.h Wed Jul 23 23:37:18 2008 +0000 @@ -113,6 +113,11 @@ #endif /* __ELF__ */ +#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6 +/* This controls a conditional in main. */ +#define LINUX_SBRK_BUG +#endif + /* On the Alpha it's best to avoid including TERMIO since struct termio and struct termios are mutually incompatible. */ #define NO_TERMIO