On Mon, Jul 20, 2015 at 2:02 PM, Peter Maydell <peter.mayd...@linaro.org> wrote: > On 8 July 2015 at 15:10, Stefan Hajnoczi <stefa...@redhat.com> wrote: >> 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 <stefa...@redhat.com> > > Do you have a plan for putting this into 2.4 or should I just > apply it to master directly?
Please apply it directly. Thanks, Stefan