]> git.proxmox.com Git - mirror_qemu.git/commit - tests/rtl8139-test.c
timer: rename NSEC_PER_SEC due to Mac OS X header clash
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 8 Jul 2015 14:10:09 +0000 (15:10 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Jul 2015 16:01:00 +0000 (17:01 +0100)
commit13566fe3e584e7b14a6f45246976b91677dc2a77
tree5d62375ef4c36a58db30feef2a65c7bcadfa44f7
parentdcc8a3ab632d0f11a1bf3b08381cf0f93e616b9f
timer: rename NSEC_PER_SEC due to Mac OS X header clash

Commit e0cf11f31c24cfb17f44ed46c254d84c78e7f6e9 ("timer: Use a single
definition of NSEC_PER_SEC for the whole codebase") renamed
NANOSECONDS_PER_SECOND to NSEC_PER_SEC.

On Mac OS X there is a <dispatch/time.h> system header which also
defines NSEC_PER_SEC.  This causes compiler warnings.

Let's use the old name instead.  It's longer but it doesn't clash.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1436364609-7929-1-git-send-email-stefanha@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/ppc/ppc.c
hw/ppc/spapr_rtc.c
hw/timer/mc146818rtc.c
hw/usb/hcd-ehci.c
include/qemu/timer.h
tests/rtl8139-test.c
tests/test-throttle.c
tests/wdt_ib700-test.c
util/throttle.c