From: Andrey <dev_null@ukr.net>
Date: Wed, 6 Apr 2011 12:21:34 +0000 (+0200)
Subject: * grub-core/video/fb/video_fb.c (grub_video_fb_setup): Silence older
X-Git-Tag: 1.99~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5ebecfabc1037532c18b42372218d45b237f192;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index b110a9803..e495fbf9a 100644
--- 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 768b63328..2226d6583 100644
--- 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)
 	{