From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Thu, 29 May 2014 08:02:58 +0000 (+0400)
Subject: * alloc.c (Fgarbage_collect): Fix compilation with
X-Git-Tag: emacs-25.0.90~2640^2~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=609b06a0a1649b9bbcc6ffe0ac96a4192f855603;p=emacs.git

* alloc.c (Fgarbage_collect): Fix compilation with
GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a71d34209b2..7665ccb7083 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)
diff --git a/src/alloc.c b/src/alloc.c
index d221cc7e967..ab383f34f04 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