[Emacs-diffs] trunk r113965: Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE

[Dmitry Antipov]

------------------------------------------------------------
revno: 113965
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-21 11:02:45 +0400
message:
  Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE
  and GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES.
  * alloc.c (toplevel): Remove unnecessary nested #if...#endif.
  (mark_maybe_object) [!GC_MARK_STACK]: Define to emacs_abort
  to shut up compiler in mark_object.
  (dump_zombies): Convert to global and add EXTERNALLY_VISIBLE.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/alloc.c                    alloc.c-20091113204419-o5vbwnq5f7feedwu-252

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-21 05:39:51 +0000
+++ b/src/ChangeLog     2013-08-21 07:02:45 +0000
@@ -1,3 +1,12 @@
+2013-08-21  Dmitry Antipov  <address@hidden>
+
+       Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE
+       and GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES.
+       * alloc.c (toplevel): Remove unnecessary nested #if...#endif.
+       (mark_maybe_object) [!GC_MARK_STACK]: Define to emacs_abort
+       to shut up compiler in mark_object.
+       (dump_zombies): Convert to global and add EXTERNALLY_VISIBLE.
+
 2013-08-21  Paul Eggert  <address@hidden>
 
        * process.c (allocate_pty) [PTY_OPEN]: Set fd's FD_CLOEXEC flag.

=== modified file 'src/alloc.c'
--- a/src/alloc.c       2013-08-14 16:36:16 +0000
+++ b/src/alloc.c       2013-08-21 07:02:45 +0000
@@ -318,7 +318,6 @@
 static struct mem_node mem_z;
 #define MEM_NIL &mem_z
 
-#if GC_MARK_STACK || defined GC_MALLOC_CHECK
 static struct mem_node *mem_insert (void *, void *, enum mem_type);
 static void mem_insert_fixup (struct mem_node *);
 static void mem_rotate_left (struct mem_node *);
@@ -326,7 +325,6 @@
 static void mem_delete (struct mem_node *);
 static void mem_delete_fixup (struct mem_node *);
 static struct mem_node *mem_find (void *);
-#endif
 
 #endif /* GC_MARK_STACK || GC_MALLOC_CHECK */
 
@@ -4238,6 +4236,10 @@
 
 #if GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
 
+/* Currently not used, but may be called from gdb.  */
+
+void dump_zombies (void) EXTERNALLY_VISIBLE;
+
 /* Array of objects that are kept alive because the C stack contains
    a pattern that looks like a reference to them .  */
 
@@ -4620,7 +4622,7 @@
 
 #elif GC_MARK_STACK == GC_USE_GCPROS_CHECK_ZOMBIES
 
-static void
+void
 dump_zombies (void)
 {
   int i;
@@ -4757,6 +4759,10 @@
 #endif
 }
 
+#else /* GC_MARK_STACK == 0 */
+
+#define mark_maybe_object(obj) emacs_abort ()
+
 #endif /* GC_MARK_STACK != 0 */