From 74d8433449b6f0d26f77655ed594ce80a405e295 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 5 Jul 1997 00:22:54 +0000 Subject: [PATCH] (memory_full): Pass Qnil to Fsignal for ERROR_SYMBOL. Fix bugs with inappropriate mixing of Lisp_Object with int. --- src/alloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/alloc.c b/src/alloc.c index ed57954cf17..b6480a63c81 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -237,7 +237,7 @@ memory_full () /* This used to call error, but if we've run out of memory, we could get infinite recursion trying to build the string. */ while (1) - Fsignal (Qerror, memory_signal_data); + Fsignal (Qnil, memory_signal_data); } /* Called if we can't allocate relocatable space for a buffer. */ @@ -514,7 +514,7 @@ mark_interval_tree (tree) #define MARK_INTERVAL_TREE(i) \ do { \ if (!NULL_INTERVAL_P (i) \ - && ! XMARKBIT ((Lisp_Object) i->parent)) \ + && ! XMARKBIT (*(Lisp_Object *) &i->parent)) \ mark_interval_tree (i); \ } while (0) @@ -2264,7 +2264,7 @@ gc_sweep () case Lisp_Misc_Free: /* If the object was already free, keep it on the free list. */ - markword = &already_free; + markword = (Lisp_Object *) &already_free; break; default: markword = 0; -- 2.39.2