[Emacs-diffs] trunk r117186: * alloc.c (Fgarbage_collect): Fix compilation with

[Dmitry Antipov]

------------------------------------------------------------
revno: 117186
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2014-05-29 12:02:58 +0400
message:
  * alloc.c (Fgarbage_collect): Fix compilation with
  GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-05-29 04:47:01 +0000
+++ b/src/ChangeLog     2014-05-29 08:02:58 +0000
@@ -1,3 +1,8 @@
+2014-05-29  Dmitry Antipov  <address@hidden>
+
+       * alloc.c (Fgarbage_collect): Fix compilation with
+       GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
+
 2014-05-29  Paul Eggert  <address@hidden>
 
        * frame.c, frame.h (frame_char_to_pixel_position)

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2014-05-24 12:02:25 +0000
+++ b/src/alloc.c       2014-05-29 08:02:58 +0000
@@ -5847,8 +5847,13 @@
   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