changeset 5163:57f4dcb14ad5

Don't assume a Lisp_Object will fit in a Bytecount, src/alloc.c 2010-03-21 Aidan Kehoe <kehoea@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.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 21 Mar 2010 13:25:21 +0000
parents 41262f87eb39
children 8bf9e67e06ec
files src/ChangeLog src/alloc.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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@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@xemacs.org>
 
 	* 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;