From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sun, 16 Jan 2005 09:59:03 +0000 (+0000)
Subject: * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
X-Git-Tag: ttn-vms-21-2-B4~2721
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=50af5100a6e0234668d100ca5d4cb3479436b8c0;p=emacs.git

* fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 57be0b86123..159e64daf67 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/fringe.c b/src/fringe.c
index e8b8cedee4c..9e9d6be081c 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1301,7 +1301,7 @@ If BITMAP already exists, the existing definition is replaced.  */)
 		= ((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 @@ init_fringe ()
   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++)
     {