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

gcc warning.

diff --git a/ChangeLog b/ChangeLog
index b110a98033c157c307a77587f3845e7c7d5a3ffd..e495fbf9a9baa7c938fac59286fcf3d928a43251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Add few

diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c
index 768b6332884c11368655ab7037b6c5f30a80a65b..2226d6583cbe2ad9e9695b466987fd2027ff8011 100644 (file)
--- a/grub-core/video/fb/video_fb.c
+++ b/grub-core/video/fb/video_fb.c
@@ -1445,13 +1445,16 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
                                  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
                                  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
                               | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
 
       err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
                                               &framebuffer.back_target,
                                               *mode_info,
-                                              (void *) page0_ptr);
+                                              tmp);
 
       if (!err)
        {