From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 26 Feb 2012 01:09:59 +0000 (-0800)
Subject: * alloc.c (mark_memory): Conditionalize recent fix on USE_USB_TAG.
X-Git-Tag: emacs-pretest-24.0.94~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9a769fba6dd1f3db1777c48b81f6d50627d5001;p=emacs.git

* alloc.c (mark_memory): Conditionalize recent fix on USE_USB_TAG.
---

diff --git a/src/alloc.c b/src/alloc.c
index 21c4db4ddca..a3e8033db18 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4312,12 +4312,14 @@ mark_memory (void *start, void *end)
 	void *w = *(void **) ((char *) pp + i);
 	mark_maybe_pointer (w);
 
+#ifdef USE_LSB_TAG
 	/* A host where a Lisp_Object is wider than a pointer might
 	   allocate a Lisp_Object in non-adjacent halves.  If
 	   USE_LSB_TAG, the bottom half is not a valid pointer, so
 	   widen it to to a Lisp_Object and check it that way.  */
 	if (sizeof w < sizeof (Lisp_Object))
 	  mark_maybe_object (widen_to_Lisp_Object (w));
+#endif
       }
 }