commit: Don't assume a Lisp_Object will fit in a Bytecount, src/alloc.c

[Aidan Kehoe]

changeset:   5163:57f4dcb14ad5
tag:         tip
user:        Aidan Kehoe <kehoea at parhasard.net>
date:        Sun Mar 21 13:25:21 2010 +0000
files:       src/ChangeLog src/alloc.c
description:
Don't assume a Lisp_Object will fit in a Bytecount, src/alloc.c

2010-03-21  Aidan Kehoe  <kehoea at parhasard.net>

	* alloc.c (tick_lrecord_stats):
	Fix the union build after Ben's last change, don't assume that a
	Lisp_Object will fit into a Bytecount.


diff -r 41262f87eb39 -r 57f4dcb14ad5 src/ChangeLog
--- a/src/ChangeLog	Sun Mar 21 13:20:35 2010 +0000
+++ b/src/ChangeLog	Sun Mar 21 13:25:21 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-21  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* alloc.c (tick_lrecord_stats):
+	Fix the union build after Ben's last change, don't assume that a
+	Lisp_Object will fit into a Bytecount.
+
 2010-03-20  Ben Wing  <ben at xemacs.org>
 
 	* alloc.c:
diff -r 41262f87eb39 -r 57f4dcb14ad5 src/alloc.c
--- a/src/alloc.c	Sun Mar 21 13:20:35 2010 +0000
+++ b/src/alloc.c	Sun Mar 21 13:25:21 2010 +0000
@@ -3649,7 +3649,7 @@
 		    enum lrecord_alloc_status status)
 {
   int type_index = h->type;
-  Bytecount obj = wrap_pointer_1 (h);
+  Lisp_Object obj = wrap_pointer_1 (h);
   Bytecount sz = lisp_object_size (obj);
   Bytecount sz_with_overhead = lisp_object_storage_size (obj, NULL);
   Bytecount overhead = sz_with_overhead - sz;