procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* alloc.c (Fgarbage_collect): Fix compilation with

Browse source 
GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
This commit is contained in:
Dmitry Antipov 2014-05-29 12:02:58 +04:00
parent 03ca10a9fa
commit 609b06a0a1
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-05-29 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c (Fgarbage_collect): Fix compilation with
GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
2014-05-29 Paul Eggert <eggert@cs.ucla.edu>
* frame.c, frame.h (frame_char_to_pixel_position)

7
src/alloc.c
View file

@ -5847,8 +5847,13 @@ See Info node `(elisp)Garbage Collection'. */)
end = stack_grows_down_p ? (char *) &j + sizeof j : (char *) &j;
#endif /* not GC_SAVE_REGISTERS_ON_STACK */
#endif /* not HAVE___BUILTIN_UNWIND_INIT */
#endif /* GC_MARK_STACK */
return garbage_collect_1 (end);
#elif (GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE)
/* Old GCPROs-based method without stack marking. */
return garbage_collect_1 (NULL);
#else
emacs_abort ();
#endif /* GC_MARK_STACK */
}
/* Mark Lisp objects in glyph matrix MATRIX. Currently the