changeset 5152:45753d9a0dc4

merge
author Ben Wing <ben@xemacs.org>
date Thu, 18 Mar 2010 23:12:41 -0500
parents 641d0cdd1d00 (diff) 0353d546dc1e (current diff)
children f552caabf58b cb303ff63e76
files
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Mar 18 13:45:34 2010 +0100
+++ b/src/ChangeLog	Thu Mar 18 23:12:41 2010 -0500
@@ -1,3 +1,9 @@
+2010-03-16  Ben Wing  <ben@xemacs.org>
+
+	* alloc.c (make_lcrecord_list):
+	* alloc.c (alloc_managed_lcrecord):
+	Fix compilation problems identified by Robert Delius Royar.
+	
 2010-03-15  Ben Wing  <ben@xemacs.org>
 
 	* extents.c (Fprevious_single_property_change):
--- a/src/alloc.c	Thu Mar 18 13:45:34 2010 +0100
+++ b/src/alloc.c	Thu Mar 18 23:12:41 2010 -0500
@@ -3200,8 +3200,8 @@
 {
   /* Don't use alloc_automanaged_lcrecord() avoid infinite recursion
      allocating this. */
-  struct lcrecord_list *p = (struct lcrecord_list *)
-    old_alloc_lcrecord (&lrecord_lcrecord_list);
+  struct lcrecord_list *p =
+    XLCRECORD_LIST (old_alloc_lcrecord (&lrecord_lcrecord_list));
 
   p->implementation = implementation;
   p->size = size;
@@ -3247,8 +3247,7 @@
       return val;
     }
   else
-    return wrap_pointer_1 (old_alloc_sized_lcrecord (list->size,
-						     list->implementation));
+    return old_alloc_sized_lcrecord (list->size, list->implementation);
 }
 
 /* "Free" a Lisp object LCRECORD by placing it on its associated free list