From 13566fe3e584e7b14a6f45246976b91677dc2a77 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Wed, 8 Jul 2015 15:10:09 +0100 Subject: 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 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 Message-id: 1436364609-7929-1-git-send-email-stefanha@redhat.com Signed-off-by: Peter Maydell --- include/qemu/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 4dda20b..5923d60 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 */ -- cgit v1.1