aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-09-08 12:59:22 +0200
committerJuanma Barranquero2011-09-08 12:59:22 +0200
commit2949f33b8a296064363f6416f64f535afe6b8eaa (patch)
treef9157f6cd27b96dbc50731a3e837ecf24540241d /src
parent8b0874b51923c5a21dc5c1e4e1c672d16214e4cf (diff)
downloademacs-2949f33b8a296064363f6416f64f535afe6b8eaa.tar.gz
emacs-2949f33b8a296064363f6416f64f535afe6b8eaa.zip
src/emacs.c (my_heap_start): #ifdef to avoid warnings when unused.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c2
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 @@
12011-09-08 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs.c (my_heap_start): #ifdef to avoid warnings when unused.
4
12011-09-07 Eli Zaretskii <eliz@gnu.org> 52011-09-07 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it 7 * 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 83ad8d95156..ed4d9c49eb8 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -171,8 +171,10 @@ int display_arg;
171 Tells GC how to save a copy of the stack. */ 171 Tells GC how to save a copy of the stack. */
172char *stack_bottom; 172char *stack_bottom;
173 173
174#if defined (DOUG_LEA_MALLOC) || defined (GNU_LINUX)
174/* The address where the heap starts (from the first sbrk (0) call). */ 175/* The address where the heap starts (from the first sbrk (0) call). */
175static void *my_heap_start; 176static void *my_heap_start;
177#endif
176 178
177#ifdef GNU_LINUX 179#ifdef GNU_LINUX
178/* The gap between BSS end and heap start as far as we can tell. */ 180/* The gap between BSS end and heap start as far as we can tell. */