[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Move definition of rgb_to_pixel_dup_table
From: |
Nathan Froyd |
Subject: |
[Qemu-devel] [PATCH] Move definition of rgb_to_pixel_dup_table |
Date: |
Thu, 22 Jan 2009 12:52:40 -0800 |
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>
---
hw/vga.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/hw/vga.c b/hw/vga.c
index 776ead0..8ec6556 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -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;
--
1.6.0.5
- [Qemu-devel] [PATCH] Move definition of rgb_to_pixel_dup_table,
Nathan Froyd <=