diff options
| author | Dmitry Antipov <[email protected]> | 2014-05-29 12:02:58 +0400 |
|---|---|---|
| committer | Dmitry Antipov <[email protected]> | 2014-05-29 12:02:58 +0400 |
| commit | 609b06a0a1649b9bbcc6ffe0ac96a4192f855603 (patch) | |
| tree | 69fd4e3640bfefe4579e3b586f22a1351bdca81e /src | |
| parent | 03ca10a9faeeb2dbeb0a803f1c29995d6d1bc7a2 (diff) | |
* alloc.c (Fgarbage_collect): Fix compilation with
GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/alloc.c | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a71d34209b..7665ccb708 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-05-29 Dmitry Antipov <[email protected]> + + * alloc.c (Fgarbage_collect): Fix compilation with + GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. + 2014-05-29 Paul Eggert <[email protected]> * frame.c, frame.h (frame_char_to_pixel_position) diff --git a/src/alloc.c b/src/alloc.c index d221cc7e96..ab383f34f0 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -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 |