gwj / at91sam9263 · Commits

Commit bdb1957197ccc9e0b6a90d3ea185c50964579acd

Authored by aliguori
1 parent deeccef3

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 <froydnj@codesourcery.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6446 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 9 additions and 11 deletions
hw/vga.c
  View file @bdb1957
@@ -1245,7 +1245,15 @@ static void vga_get_text_resolution(VGAState *s, int *pwidth, int *pheight, @@ -1245,7 +1245,15 @@ static void vga_get_text_resolution(VGAState *s, int *pwidth, int *pheight,
1245 1245
1246 typedef unsigned int rgb_to_pixel_dup_func(unsigned int r, unsigned int g, unsigned b); 1246 typedef unsigned int rgb_to_pixel_dup_func(unsigned int r, unsigned int g, unsigned b);
1247 1247
1248 -static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS]; 1248 +static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS] = {
  1249 + rgb_to_pixel8_dup,
  1250 + rgb_to_pixel15_dup,
  1251 + rgb_to_pixel16_dup,
  1252 + rgb_to_pixel32_dup,
  1253 + rgb_to_pixel32bgr_dup,
  1254 + rgb_to_pixel15bgr_dup,
  1255 + rgb_to_pixel16bgr_dup,
  1256 +};
1249 1257
1250 /* 1258 /*
1251 * Text mode update 1259 * Text mode update
@@ -1512,16 +1520,6 @@ static vga_draw_line_func *vga_draw_line_table[NB_DEPTHS * VGA_DRAW_LINE_NB] = { @@ -1512,16 +1520,6 @@ static vga_draw_line_func *vga_draw_line_table[NB_DEPTHS * VGA_DRAW_LINE_NB] = {
1512 vga_draw_line32_16bgr, 1520 vga_draw_line32_16bgr,
1513 }; 1521 };
1514 1522
1515 -static rgb_to_pixel_dup_func *rgb_to_pixel_dup_table[NB_DEPTHS] = {  
1516 - rgb_to_pixel8_dup,  
1517 - rgb_to_pixel15_dup,  
1518 - rgb_to_pixel16_dup,  
1519 - rgb_to_pixel32_dup,  
1520 - rgb_to_pixel32bgr_dup,  
1521 - rgb_to_pixel15bgr_dup,  
1522 - rgb_to_pixel16bgr_dup,  
1523 -};  
1524 -  
1525 static int vga_get_bpp(VGAState *s) 1523 static int vga_get_bpp(VGAState *s)
1526 { 1524 {
1527 int ret; 1525 int ret;