aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bf010c6d29b..0485ee5517e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-10-03 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * alloc.c (Fgarbage_collect): Prevent compiler warning for a call
4 to `mark_object'.
5
12000-10-02 Stefan Monnier <monnier@cs.yale.edu> 62000-10-02 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * syntax.c (forw_comment): Match nestedness of ender/starter. 8 * syntax.c (forw_comment): Match nestedness of ender/starter.
diff --git a/src/alloc.c b/src/alloc.c
index fc8787670e6..7a1d488c6a0 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3600,7 +3600,9 @@ Garbage collection happens automatically if you cons more than\n\
3600 for (i = 0; i < tail->nvars; i++) 3600 for (i = 0; i < tail->nvars; i++)
3601 if (!XMARKBIT (tail->var[i])) 3601 if (!XMARKBIT (tail->var[i]))
3602 { 3602 {
3603 mark_object (&tail->var[i]); 3603 /* Explicit casting prevents compiler warning about
3604 discarding the `volatile' qualifier. */
3605 mark_object ((Lisp_Object *)&tail->var[i]);
3604 XMARK (tail->var[i]); 3606 XMARK (tail->var[i]);
3605 } 3607 }
3606#endif 3608#endif