qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [6446] Move definition of rgb_to_pixel_dup_table (Nathan Fr


From: Anthony Liguori
Subject: [Qemu-devel] [6446] Move definition of rgb_to_pixel_dup_table (Nathan Froyd)
Date: Mon, 26 Jan 2009 17:07:42 +0000

Revision: 6446
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6446
Author:   aliguori
Date:     2009-01-26 17:07:42 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Move definition of rgb_to_pixel_dup_table (Nathan Froyd)

This fixes the warning:

/scratch/froydnj/qemu.git/hw/vga.c:1515: warning: redundant redeclaration of 
'rgb_to_pixel_dup_table'
/scratch/froydnj/qemu.git/hw/vga.c:1248: warning: previous declaration of 
'rgb_to_pixel_dup_table' was here

Signed-off-by: Nathan Froyd <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/hw/vga.c

Modified: trunk/hw/vga.c
===================================================================
--- trunk/hw/vga.c      2009-01-26 15:57:52 UTC (rev 6445)
+++ trunk/hw/vga.c      2009-01-26 17:07:42 UTC (rev 6446)
@@ -1245,7 +1245,15 @@
 
 typedef unsigned int rgb_to_pixel_dup_func(unsigned int r, unsigned int g, 
unsigned b);
 
-static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS];
+static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS] = {
+    rgb_to_pixel8_dup,
+    rgb_to_pixel15_dup,
+    rgb_to_pixel16_dup,
+    rgb_to_pixel32_dup,
+    rgb_to_pixel32bgr_dup,
+    rgb_to_pixel15bgr_dup,
+    rgb_to_pixel16bgr_dup,
+};
 
 /*
  * Text mode update
@@ -1512,16 +1520,6 @@
     vga_draw_line32_16bgr,
 };
 
-static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS] = {
-    rgb_to_pixel8_dup,
-    rgb_to_pixel15_dup,
-    rgb_to_pixel16_dup,
-    rgb_to_pixel32_dup,
-    rgb_to_pixel32bgr_dup,
-    rgb_to_pixel15bgr_dup,
-    rgb_to_pixel16bgr_dup,
-};
-
 static int vga_get_bpp(VGAState *s)
 {
     int ret;






reply via email to

[Prev in Thread] Current Thread [Next in Thread]