From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LQ6Xa-0008St-SG for qemu-devel@nongnu.org; Thu, 22 Jan 2009 15:52:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LQ6Xa-0008S5-8P for qemu-devel@nongnu.org; Thu, 22 Jan 2009 15:52:42 -0500 Received: from [199.232.76.173] (port=37685 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LQ6Xa-0008Rv-08 for qemu-devel@nongnu.org; Thu, 22 Jan 2009 15:52:42 -0500 Received: from mx20.gnu.org ([199.232.41.8]:41196) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LQ6XZ-00067U-Oa for qemu-devel@nongnu.org; Thu, 22 Jan 2009 15:52:41 -0500 Received: from mail.codesourcery.com ([65.74.133.4]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LQ6XY-000600-Sx for qemu-devel@nongnu.org; Thu, 22 Jan 2009 15:52:41 -0500 From: Nathan Froyd Date: Thu, 22 Jan 2009 12:52:40 -0800 Message-Id: <1232657560-23025-1-git-send-email-froydnj@codesourcery.com> Subject: [Qemu-devel] [PATCH] Move definition of rgb_to_pixel_dup_table Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 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 --- 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