# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1105869543 0
# Node ID 26fb5a3f95ac07f02c86c58868150f3b76c8dc11
# Parent  f43d0816e9c3a0cec6a1a00a4472ca3d624601fb
* fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.

diff -r f43d0816e9c3 -r 26fb5a3f95ac src/ChangeLog
--- a/src/ChangeLog	Sun Jan 16 09:17:02 2005 +0000
+++ b/src/ChangeLog	Sun Jan 16 09:59:03 2005 +0000
@@ -1,3 +1,8 @@
+2005-01-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
+	fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
+
 2005-01-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW)
diff -r f43d0816e9c3 -r 26fb5a3f95ac src/fringe.c
--- a/src/fringe.c	Sun Jan 16 09:17:02 2005 +0000
+++ b/src/fringe.c	Sun Jan 16 09:59:03 2005 +0000
@@ -1301,7 +1301,7 @@
 		= ((struct fringe_bitmap **)
 		   xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *)));
 	      fringe_faces
-		= (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object));
+		= (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object));
 
 	      for (; i < max_fringe_bitmaps; i++)
 		{
@@ -1472,7 +1472,7 @@
   fringe_bitmaps
     = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *));
   fringe_faces
-    = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
+    = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object));
 
   for (i = 0; i < max_fringe_bitmaps; i++)
     {