diff options
| author | Ken Brown | 2011-08-16 16:31:32 -0400 |
|---|---|---|
| committer | Ken Brown | 2011-08-16 16:31:32 -0400 |
| commit | db76dd852eb54c00a6d8350acb2ceb63a6559248 (patch) | |
| tree | b3bf22b6c9ebcd21adc1f9ba121466947daa9dbb | |
| parent | 9c4aeabf550b825ddfd501b49d5df0c31ab6b446 (diff) | |
| download | emacs-db76dd852eb54c00a6d8350acb2ceb63a6559248.tar.gz emacs-db76dd852eb54c00a6d8350acb2ceb63a6559248.zip | |
* src/gmalloc.c: Expand comment.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gmalloc.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5bc07722191..ac9864f9f95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-08-16 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * gmalloc.c: Expand comment. | ||
| 4 | |||
| 1 | 2011-08-16 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-08-16 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (set_cursor_from_row): Don't accept a previous candidate | 7 | * xdisp.c (set_cursor_from_row): Don't accept a previous candidate |
diff --git a/src/gmalloc.c b/src/gmalloc.c index 61046ad9d1b..d49259b8ed7 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c | |||
| @@ -356,7 +356,11 @@ Fifth Floor, Boston, MA 02110-1301, USA. | |||
| 356 | emacs uses the Cygwin heap (managed with sbrk). When emacs starts | 356 | emacs uses the Cygwin heap (managed with sbrk). When emacs starts |
| 357 | on Cygwin, it reinitializes malloc, and we save the old info for | 357 | on Cygwin, it reinitializes malloc, and we save the old info for |
| 358 | use by free and realloc if they're called with a pointer into the | 358 | use by free and realloc if they're called with a pointer into the |
| 359 | static heap. */ | 359 | static heap. |
| 360 | |||
| 361 | Currently (2011-08-16) the Cygwin build doesn't use ralloc.c; if | ||
| 362 | this is changed in the future, we'll have to similarly deal with | ||
| 363 | reinitializing ralloc. */ | ||
| 360 | #ifdef CYGWIN | 364 | #ifdef CYGWIN |
| 361 | extern __ptr_t bss_sbrk PP ((ptrdiff_t __size)); | 365 | extern __ptr_t bss_sbrk PP ((ptrdiff_t __size)); |
| 362 | extern int bss_sbrk_did_unexec; | 366 | extern int bss_sbrk_did_unexec; |