diff src/alloc.c @ 2551:9f70af3ac939

[xemacs-hg @ 2005-02-03 16:14:02 by james] Commit Olivier Galibert's dumper updates for bignums and use them. See xemacs-patches message with ID <ps8y685c6p.fsf@diannao.ittc.ku.edu>.
author james
date Thu, 03 Feb 2005 16:14:08 +0000
parents 989a7680c221
children e6854ec89f8e
line wrap: on
line diff
--- a/src/alloc.c	Thu Feb 03 07:30:22 2005 +0000
+++ b/src/alloc.c	Thu Feb 03 16:14:08 2005 +0000
@@ -2662,7 +2662,7 @@
 */
 
 const struct memory_description free_description[] = {
-  { XD_LISP_OBJECT, offsetof (struct free_lcrecord_header, chain), 0, 0,
+  { XD_LISP_OBJECT, offsetof (struct free_lcrecord_header, chain), 0, { 0 },
     XD_FLAG_FREE_LISP_OBJECT },
   { XD_END }
 };
@@ -2674,7 +2674,7 @@
 			       struct free_lcrecord_header);
 
 const struct memory_description lcrecord_list_description[] = {
-  { XD_LISP_OBJECT, offsetof (struct lcrecord_list, free), 0, 0,
+  { XD_LISP_OBJECT, offsetof (struct lcrecord_list, free), 0, { 0 },
     XD_FLAG_FREE_LISP_OBJECT },
   { XD_END }
 };
@@ -3152,7 +3152,8 @@
 	    
 	return (val *
 		lispdesc_block_size
-		(rdata, lispdesc_indirect_description (obj, desc1->data2)));
+		(rdata,
+		 lispdesc_indirect_description (obj, desc1->data2.descr)));
       }
     case XD_OPAQUE_DATA_PTR:
       return sizeof (void *);
@@ -3162,7 +3163,7 @@
 	   description, use it; else compute size based on current union
 	   constant. */
 	const struct sized_memory_description *sdesc =
-	  lispdesc_indirect_description (obj, desc1->data2);
+	  lispdesc_indirect_description (obj, desc1->data2.descr);
 	if (sdesc->size)
 	  return sdesc->size;
 	else
@@ -3179,7 +3180,7 @@
 	   description, use it; else compute size based on maximum of all
 	   possible structures. */
 	const struct sized_memory_description *sdesc =
-	  lispdesc_indirect_description (obj, desc1->data2);
+	  lispdesc_indirect_description (obj, desc1->data2.descr);
 	if (sdesc->size)
 	  return sdesc->size;
 	else
@@ -3520,7 +3521,7 @@
 		EMACS_INT count = lispdesc_indirect_count (desc1->data1, desc,
 							   data);
 		const struct sized_memory_description *sdesc =
-		  lispdesc_indirect_description (data, desc1->data2);
+		  lispdesc_indirect_description (data, desc1->data2.descr);
 		const char *dobj = * (const char **) rdata;
 		if (dobj)
 		  mark_struct_contents (dobj, sdesc, count);
@@ -3531,7 +3532,7 @@
 		EMACS_INT count = lispdesc_indirect_count (desc1->data1, desc,
 							   data);
 		const struct sized_memory_description *sdesc =
-		  lispdesc_indirect_description (data, desc1->data2);
+		  lispdesc_indirect_description (data, desc1->data2.descr);
 		      
 		mark_struct_contents (rdata, sdesc, count);
 		break;