diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 44b8e168031..a4c985b1a0c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-09-08 Juanma Barranquero <lekktu@gmail.com> + + * emacs.c (my_heap_start): #ifdef to avoid warnings when unused. + 2011-09-07 Eli Zaretskii <eliz@gnu.org> * xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it diff --git a/src/emacs.c b/src/emacs.c index 57a52a0c48f..c766523b1c3 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -174,8 +174,10 @@ int display_arg; Tells GC how to save a copy of the stack. */ char *stack_bottom; +#if defined (DOUG_LEA_MALLOC) || defined (GNU_LINUX) /* The address where the heap starts (from the first sbrk (0) call). */ static void *my_heap_start; +#endif #ifdef GNU_LINUX /* The gap between BSS end and heap start as far as we can tell. */ |