vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/video/fb/video_fb.c (grub_video_fb_setup): Silence older

Browse source 
gcc warning.
This commit is contained in:
Andrey 2011-04-06 14:21:34 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 7755f66e64
commit b5ebecfabc
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-04-06 Andrey <dev_null@ukr.net>
* grub-core/video/fb/video_fb.c (grub_video_fb_setup): Silence older
gcc warning.
2011-04-06 Vladimir Serbinenko <phcoder@gmail.com> 2011-04-06 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Add few * grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Add few

5
grub-core/video/fb/video_fb.c
View file

@ -1445,13 +1445,16 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED, GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
0)) 0))
{ {
/* It was much nicer with the cast directly at function call but
some older gcc versions don't accept it properly.*/
void *tmp = (void *) page0_ptr;
mode_info->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED mode_info->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
| GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target, err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
&framebuffer.back_target, &framebuffer.back_target,
*mode_info, *mode_info,
(void *) page0_ptr); tmp);
if (!err) if (!err)
{ {