Commit bdb19571 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6446 c046a42c-6fe2-441c-8c8c-71466251a162
parent deeccef3

hw/vga.c

+9 −11
Original line number Diff line number Diff line
@@ -1245,7 +1245,15 @@ static void vga_get_text_resolution(VGAState *s, int *pwidth, int *pheight, 


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 @@ static vga_draw_line_func *vga_draw_line_table[NB_DEPTHS * VGA_DRAW_LINE_NB] = { 
    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;