diff options
author | malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-12 20:36:27 +0000 |
---|---|---|
committer | malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-11-12 20:36:27 +0000 |
commit | c310de8657b12e805b2ac225e6932b8beed013cf (patch) | |
tree | 01ca43e30fa7d5006b2642b233dfca1cf00affcd /audio/audio.c | |
parent | 2946898b48bd210b4874c80e720ffc59572532d0 (diff) |
Rename hz to hertz to keep AIX happy
The issue was first noticed/addressed by Laurent Vivier in his QEMU on
AIX patches.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5712 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'audio/audio.c')
-rw-r--r-- | audio/audio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/audio/audio.c b/audio/audio.c index 79d8b204b..f24215b87 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -54,7 +54,7 @@ static struct { struct fixed_settings fixed_out; struct fixed_settings fixed_in; union { - int hz; + int hertz; int64_t ticks; } period; int plive; @@ -1520,7 +1520,7 @@ static struct audio_option audio_options[] = { "Number of voices for ADC", NULL, 0}, /* Misc */ - {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hz, + {"TIMER_PERIOD", AUD_OPT_INT, &conf.period.hertz, "Timer period in HZ (0 - use lowest possible)", NULL, 0}, {"PLIVE", AUD_OPT_BOOL, &conf.plive, @@ -1781,16 +1781,16 @@ AudioState *AUD_init (void) if (done) { VMChangeStateEntry *e; - if (conf.period.hz <= 0) { - if (conf.period.hz < 0) { + if (conf.period.hertz <= 0) { + if (conf.period.hertz < 0) { dolog ("warning: Timer period is negative - %d " "treating as zero\n", - conf.period.hz); + conf.period.hertz); } conf.period.ticks = 1; } else { - conf.period.ticks = ticks_per_sec / conf.period.hz; + conf.period.ticks = ticks_per_sec / conf.period.hertz; } e = qemu_add_vm_change_state_handler (audio_vm_change_state_handler, s); |