diff options
| author | Jan Djärv | 2005-01-16 09:59:03 +0000 |
|---|---|---|
| committer | Jan Djärv | 2005-01-16 09:59:03 +0000 |
| commit | 50af5100a6e0234668d100ca5d4cb3479436b8c0 (patch) | |
| tree | 8ab3245d3c0829f1a988e437bf8d7c60d3a9da67 /src | |
| parent | a2d5fca0444b5e1a83d8c84f21674f2ba48d0a26 (diff) | |
| download | emacs-50af5100a6e0234668d100ca5d4cb3479436b8c0.tar.gz emacs-50af5100a6e0234668d100ca5d4cb3479436b8c0.zip | |
* fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/fringe.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 57be0b86123..159e64daf67 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2005-01-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning | ||
| 4 | fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *. | ||
| 5 | |||
| 1 | 2005-01-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2005-01-16 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * keyboard.c (READABLE_EVENTS_DO_TIMERS_NOW) | 8 | * 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. */) | |||
| 1301 | = ((struct fringe_bitmap **) | 1301 | = ((struct fringe_bitmap **) |
| 1302 | xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *))); | 1302 | xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *))); |
| 1303 | fringe_faces | 1303 | fringe_faces |
| 1304 | = (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object)); | 1304 | = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object)); |
| 1305 | 1305 | ||
| 1306 | for (; i < max_fringe_bitmaps; i++) | 1306 | for (; i < max_fringe_bitmaps; i++) |
| 1307 | { | 1307 | { |
| @@ -1472,7 +1472,7 @@ init_fringe () | |||
| 1472 | fringe_bitmaps | 1472 | fringe_bitmaps |
| 1473 | = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *)); | 1473 | = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *)); |
| 1474 | fringe_faces | 1474 | fringe_faces |
| 1475 | = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object)); | 1475 | = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object)); |
| 1476 | 1476 | ||
| 1477 | for (i = 0; i < max_fringe_bitmaps; i++) | 1477 | for (i = 0; i < max_fringe_bitmaps; i++) |
| 1478 | { | 1478 | { |