diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-07-08 15:10:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-20 17:01:00 +0100 |
| commit | 13566fe3e584e7b14a6f45246976b91677dc2a77 (patch) | |
| tree | 5d62375ef4c36a58db30feef2a65c7bcadfa44f7 /include | |
| parent | dcc8a3ab632d0f11a1bf3b08381cf0f93e616b9f (diff) | |
| download | qemu-13566fe3e584e7b14a6f45246976b91677dc2a77.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 4dda20bc75..5923d600fd 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -5,7 +5,7 @@ #include "qemu-common.h" #include "qemu/notify.h" -#define NSEC_PER_SEC 1000000000LL +#define NANOSECONDS_PER_SECOND 1000000000LL /* timers */ |