From b0f74c87a1dbd6b0c5e4de7f1c5cb40197e3fbe9 Mon Sep 17 00:00:00 2001 From: balrog Date: Wed, 12 Nov 2008 17:36:08 +0000 Subject: Don't use "hz" in identifiers to make AIX happy. malc found AIX headers leak "hz" and so it can't be used there. Change the occurences in hw/. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5709 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/vga.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/vga.c') diff --git a/hw/vga.c b/hw/vga.c index ca8acfe24e..bd59aae264 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -169,7 +169,7 @@ static void vga_precise_update_retrace_info(VGAState *s) int div2, sldiv2, dots; int clocking_mode; int clock_sel; - const int hz[] = {25175000, 28322000, 25175000, 25175000}; + const int clk_hz[] = {25175000, 28322000, 25175000, 25175000}; int64_t chars_per_sec; struct vga_precise_retrace *r = &s->retrace_info.precise; @@ -194,7 +194,7 @@ static void vga_precise_update_retrace_info(VGAState *s) clock_sel = (s->msr >> 2) & 3; dots = (s->msr & 1) ? 8 : 9; - chars_per_sec = hz[clock_sel] / dots; + chars_per_sec = clk_hz[clock_sel] / dots; htotal_chars <<= clocking_mode; @@ -239,7 +239,7 @@ static void vga_precise_update_retrace_info(VGAState *s) div2, sldiv2, clocking_mode, clock_sel, - hz[clock_sel], + clk_hz[clock_sel], dots, r->ticks_per_char ); -- cgit v1.2.3